summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks/main.yml
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-22 09:08:19 -0500
committerGitHub <noreply@github.com>2017-11-22 09:08:19 -0500
commit4f83051b3b7c80e3ad71fc28108cd1fc3646b385 (patch)
treeee55d37f54a05008201b29b8afcd22cf2d4ac234 /roles/etcd/tasks/main.yml
parent46ce19180bf4fe05327ab8a15bb689d908779e75 (diff)
parenta1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1 (diff)
downloadopenshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.gz
openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.bz2
openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.xz
openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.zip
Merge pull request #6193 from mgugino-upstream-stage/etc-runtime
Cleanup etcd runtime variable.
Diffstat (limited to 'roles/etcd/tasks/main.yml')
-rw-r--r--roles/etcd/tasks/main.yml8
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