diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-20 17:20:25 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-11-21 16:23:37 -0500 |
commit | a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1 (patch) | |
tree | 99ac77931e1770a6d45d07a5fd534460df7e1654 /roles/etcd/tasks/main.yml | |
parent | 51a0cbd42807c91a5e30fa58362b8745a40607f2 (diff) | |
download | openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.gz openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.bz2 openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.xz openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.zip |
Cleanup etcd runtime variable.
Cleaning out reference to etcd_runtime in openshift facts.
Diffstat (limited to 'roles/etcd/tasks/main.yml')
-rw-r--r-- | roles/etcd/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index fabe66b91..78ec2cedb 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -30,7 +30,7 @@ src: etcd.docker.service when: - etcd_is_containerized | bool - - not openshift.common.is_etcd_system_container | bool + - not l_is_etcd_system_container | bool # Start secondary etcd instance for third party integrations # TODO: Determine an alternative to using thirdparty variable @@ -90,7 +90,7 @@ enabled: no masked: yes daemon_reload: yes - when: not openshift.common.is_etcd_system_container | bool + when: not l_is_etcd_system_container | bool register: task_result failed_when: task_result|failed and 'could not' not in task_result.msg|lower @@ -98,11 +98,11 @@ template: dest: "/etc/systemd/system/etcd_container.service" src: etcd.docker.service - when: not openshift.common.is_etcd_system_container | bool + when: not l_is_etcd_system_container | bool - name: Install Etcd system container include: system_container.yml - when: openshift.common.is_etcd_system_container | bool + when: l_is_etcd_system_container | bool when: etcd_is_containerized | bool - name: Validate permissions on the config dir |