diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-07-01 22:32:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-01 22:32:28 -0400 |
commit | a9d8e96663ba0520e6ec89d968790c3d23cb18af (patch) | |
tree | 533372eba2ca10b7ca0be2edad3c84c3e4e7a921 /roles/openshift_node_upgrade/tasks | |
parent | 7c045ba7cfb6c6d15ea2d94830e048c335bda594 (diff) | |
parent | 841cefdae64bf6e01ff85b3fcec3a12e6aeabf7e (diff) | |
download | openshift-a9d8e96663ba0520e6ec89d968790c3d23cb18af.tar.gz openshift-a9d8e96663ba0520e6ec89d968790c3d23cb18af.tar.bz2 openshift-a9d8e96663ba0520e6ec89d968790c3d23cb18af.tar.xz openshift-a9d8e96663ba0520e6ec89d968790c3d23cb18af.zip |
Merge pull request #4530 from sdodson/node-dns
Utilize node dns services
Diffstat (limited to 'roles/openshift_node_upgrade/tasks')
-rw-r--r-- | roles/openshift_node_upgrade/tasks/main.yml | 11 | ||||
-rw-r--r-- | roles/openshift_node_upgrade/tasks/rpm_upgrade.yml | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml index 8eaa68cc9..9807aa9a3 100644 --- a/roles/openshift_node_upgrade/tasks/main.yml +++ b/roles/openshift_node_upgrade/tasks/main.yml @@ -133,6 +133,17 @@ - ansible_selinux is defined - ansible_selinux.status == 'enabled' +- name: Apply 3.6 dns config changes + yedit: + src: /etc/origin/node/node-config.yaml + key: "{{ item.key }}" + value: "{{ item.value }}" + with_items: + - key: "dnsBindAddress" + value: "127.0.0.1:53" + - key: "dnsRecursiveResolvConf" + value: "/etc/origin/node/resolv.conf" + # Restart all services - include: restart.yml diff --git a/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml b/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml index 06a2d16ba..a998acf21 100644 --- a/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml +++ b/roles/openshift_node_upgrade/tasks/rpm_upgrade.yml @@ -16,7 +16,7 @@ - name: Install Node service file template: dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service" - src: "{{ openshift.common.service_type }}-node.service.j2" + src: "node.service.j2" register: l_node_unit # NOTE: This is needed to make sure we are using the correct set |