diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-12-18 16:13:36 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-12-20 10:13:51 -0500 |
commit | e6c159afb4ba39a7266c750d43d6a5e911cc8f21 (patch) | |
tree | 99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /roles/openshift_node/tasks/config.yml | |
parent | a5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff) | |
download | openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.gz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.bz2 openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.xz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.zip |
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need
to duplicate the logic all around the codebase.
Diffstat (limited to 'roles/openshift_node/tasks/config.yml')
-rw-r--r-- | roles/openshift_node/tasks/config.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml index 8f38a47aa..1103fe4c9 100644 --- a/roles/openshift_node/tasks/config.yml +++ b/roles/openshift_node/tasks/config.yml @@ -4,7 +4,7 @@ - name: Pull container images include_tasks: container_images.yml - when: openshift.common.is_containerized | bool + when: openshift_is_containerized | bool - name: Start and enable openvswitch service systemd: @@ -13,7 +13,7 @@ state: started daemon_reload: yes when: - - openshift.common.is_containerized | bool + - openshift_is_containerized | bool - openshift_node_use_openshift_sdn | default(true) | bool register: ovs_start_result until: not (ovs_start_result is failed) @@ -58,7 +58,7 @@ # restarted after the node restarts docker and it will take up to 60 seconds for # systemd to start the master again - when: - - openshift.common.is_containerized | bool + - openshift_is_containerized | bool - not openshift_node_bootstrap block: - name: Wait for master API to become available before proceeding |