summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks/main.yml
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 13:26:55 -0500
committerGitHub <noreply@github.com>2017-11-22 13:26:55 -0500
commit71e090a7a301ffd5ccef6bb78a28bfae96130ce6 (patch)
tree8bf7b5a9c95b3c7b3613b563a25dad45dbebfd83 /roles/etcd/tasks/main.yml
parent84703c7100e3abef586a77899512f8c494f3f101 (diff)
parentee5a7693a20be56b60b965aa92b4727593dd811c (diff)
downloadopenshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.tar.gz
openshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.tar.bz2
openshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.tar.xz
openshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.zip
Merge pull request #6225 from mtnbikenc/include-deprecation-openshift-etcd
Include Deprecation - openshift-etcd
Diffstat (limited to 'roles/etcd/tasks/main.yml')
-rw-r--r--roles/etcd/tasks/main.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index 78ec2cedb..5ee9335f5 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -7,14 +7,13 @@
etcd_ip: "{{ etcd_ip }}"
- name: setup firewall
- include: firewall.yml
- static: yes
+ import_tasks: firewall.yml
- name: Install etcd
package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present
when: not etcd_is_containerized | bool
-- include: drop_etcdctl.yml
+- include_tasks: drop_etcdctl.yml
when:
- openshift_etcd_etcdctl_profile | default(true) | bool
@@ -101,7 +100,7 @@
when: not l_is_etcd_system_container | bool
- name: Install Etcd system container
- include: system_container.yml
+ include_tasks: system_container.yml
when: l_is_etcd_system_container | bool
when: etcd_is_containerized | bool