diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-07 16:32:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 16:32:56 -0400 |
| commit | 7b1c455c01d10ab5aa804ad48a5b60ab53d6a0c8 (patch) | |
| tree | b900625cbb8a97af4d2cf0d19d452bd643a9e0ec /roles/openshift_node/tasks | |
| parent | dc0e3d218ba953e1bc1525ef337f99677deee6c3 (diff) | |
| parent | efe86b44bce679db38cca654818dc3837bb05f6a (diff) | |
| download | openshift-7b1c455c01d10ab5aa804ad48a5b60ab53d6a0c8.tar.gz openshift-7b1c455c01d10ab5aa804ad48a5b60ab53d6a0c8.tar.bz2 openshift-7b1c455c01d10ab5aa804ad48a5b60ab53d6a0c8.tar.xz openshift-7b1c455c01d10ab5aa804ad48a5b60ab53d6a0c8.zip | |
Merge pull request #5211 from kwoodson/provisioning_fixes
Provisioning updates.
Diffstat (limited to 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/bootstrap.yml | 33 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 7 |
2 files changed, 29 insertions, 11 deletions
diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml index cb1440283..b83b2c452 100644 --- a/roles/openshift_node/tasks/bootstrap.yml +++ b/roles/openshift_node/tasks/bootstrap.yml @@ -42,14 +42,25 @@ path: /etc/origin/.config_managed register: rpmgenerated_config -- name: Remove RPM generated config files if present - file: - path: "/etc/origin/{{ item }}" - state: absent - when: - - rpmgenerated_config.stat.exists - - openshift_deployment_type in ['openshift-enterprise', 'atomic-enterprise'] - with_items: - - master - - node - - .config_managed +- when: rpmgenerated_config.stat.exists + block: + - name: Remove RPM generated config files if present + file: + path: "/etc/origin/{{ item }}" + state: absent + with_items: + - master + + # with_fileglob doesn't work correctly due to a few issues. + # Could change this to fileglob when it gets fixed. + - name: find all files in /etc/origin/node so we can remove them + find: + path: /etc/origin/node/ + register: find_results + + - name: Remove everything except the resolv.conf required for node + file: + path: "{{ item.path }}" + state: absent + when: "'resolv.conf' not in item.path or 'node-dnsmasq.conf' not in item.path" + with_items: "{{ find_results.files }}" diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 10a44d2e0..22ff6dfd2 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -49,6 +49,13 @@ state: restarted when: openshift_use_crio | default(false) +- name: restart NetworkManager to ensure resolv.conf is present + systemd: + name: NetworkManager + enabled: yes + state: restarted + when: openshift_node_bootstrap | bool + # The atomic-openshift-node service will set this parameter on # startup, but if the network service is restarted this setting is # lost. Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1372388 |