summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-22 11:04:31 -0400
committerGitHub <noreply@github.com>2017-06-22 11:04:31 -0400
commite18bd4fbe1b8035e87140390c0c27c73282b5ea3 (patch)
tree2358c80c382f881647423a202779c590cddec2df
parentea79d8b9efe03e06640cffe8b7e03580a3832c3a (diff)
parented6c9f46272ef927611a1d2cc02826ea0028d571 (diff)
downloadopenshift-e18bd4fbe1b8035e87140390c0c27c73282b5ea3.tar.gz
openshift-e18bd4fbe1b8035e87140390c0c27c73282b5ea3.tar.bz2
openshift-e18bd4fbe1b8035e87140390c0c27c73282b5ea3.tar.xz
openshift-e18bd4fbe1b8035e87140390c0c27c73282b5ea3.zip
Merge pull request #4503 from giuseppe/fix-unable-to-mask-service-etcd_container
Merged by openshift-bot
-rw-r--r--roles/etcd/tasks/system_container.yml13
1 files changed, 10 insertions, 3 deletions
diff --git a/roles/etcd/tasks/system_container.yml b/roles/etcd/tasks/system_container.yml
index f1d948d16..a01df66b3 100644
--- a/roles/etcd/tasks/system_container.yml
+++ b/roles/etcd/tasks/system_container.yml
@@ -24,23 +24,30 @@
systemd:
name: etcd
state: stopped
- enabled: yes
+ enabled: no
masked: no
daemon_reload: yes
register: task_result
failed_when: task_result|failed and 'could not' not in task_result.msg|lower
- when: "'etcd' in etcd_result.stdout"
+ when: "'etcd' not in etcd_result.stdout"
- name: Disable etcd_container
systemd:
name: etcd_container
state: stopped
enabled: no
- masked: yes
daemon_reload: yes
register: task_result
failed_when: task_result|failed and 'could not' not in task_result.msg|lower
+- name: Remove etcd_container.service
+ file:
+ path: /etc/systemd/system/etcd_container.service
+ state: absent
+
+- name: Systemd reload configuration
+ systemd: name=etcd_container daemon_reload=yes
+
- name: Check for previous etcd data store
stat:
path: "{{ etcd_data_dir }}/member/"