summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-29 16:08:11 -0400
committerGitHub <noreply@github.com>2016-08-29 16:08:11 -0400
commitf69493b5fabd8e836565ad2d61e377569d37ee60 (patch)
treedf89420b396bbed7dc27096fa1077e232535f929 /roles/openshift_node
parente9123c420fd80ab48b7b98c9ab8494df3fa69a5d (diff)
parentab613a33db8069bf51940feb1fa35616bbbfd360 (diff)
downloadopenshift-f69493b5fabd8e836565ad2d61e377569d37ee60.tar.gz
openshift-f69493b5fabd8e836565ad2d61e377569d37ee60.tar.bz2
openshift-f69493b5fabd8e836565ad2d61e377569d37ee60.tar.xz
openshift-f69493b5fabd8e836565ad2d61e377569d37ee60.zip
Merge pull request #2378 from dgoodwin/node-reload-units
Reload units after node container service modified.
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/main.yml6
-rw-r--r--roles/openshift_node/tasks/systemd_units.yml6
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index cad549bd2..dc36b542d 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -55,12 +55,6 @@
- name: Install the systemd units
include: systemd_units.yml
-- name: Reload systemd units
- command: systemctl daemon-reload
- when: openshift.common.is_containerized | bool and (install_node_result | changed or install_ovs_sysconfig | changed or install_node_dep_result | changed)
- notify:
- - restart node
-
- name: Start and enable openvswitch docker service
service: name=openvswitch.service enabled=yes state=started
when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 39e5386d4..025cb567e 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -47,3 +47,9 @@
line: "IMAGE_VERSION={{ openshift_image_tag }}"
notify:
- restart node
+
+- name: Reload systemd units
+ command: systemctl daemon-reload
+ when: openshift.common.is_containerized | bool and (install_node_result | changed or install_ovs_sysconfig | changed or install_node_dep_result | changed)
+ notify:
+ - restart node