diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-30 08:31:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 08:31:23 -0400 |
| commit | 028a43739d2752b65e2d37c87ddf2296a22f0b90 (patch) | |
| tree | 723d1e0511d2005c7af75ed1335290eafaec0f24 /playbooks/common/openshift-etcd | |
| parent | 9c3d1e0f8eb246c5e9a25f33af13ce01fec9024f (diff) | |
| parent | 104400bff26e7522ab6e023bcd5a247d3931c4e9 (diff) | |
| download | openshift-028a43739d2752b65e2d37c87ddf2296a22f0b90.tar.gz openshift-028a43739d2752b65e2d37c87ddf2296a22f0b90.tar.bz2 openshift-028a43739d2752b65e2d37c87ddf2296a22f0b90.tar.xz openshift-028a43739d2752b65e2d37c87ddf2296a22f0b90.zip | |
Merge pull request #5257 from mtnbikenc/fix-scaleup
Move firewall install and fix scaleup playbooks
Diffstat (limited to 'playbooks/common/openshift-etcd')
| -rw-r--r-- | playbooks/common/openshift-etcd/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-etcd/scaleup.yml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml index 2cb6197d1..f2b85eea1 100644 --- a/playbooks/common/openshift-etcd/config.yml +++ b/playbooks/common/openshift-etcd/config.yml @@ -3,6 +3,7 @@ hosts: oo_etcd_to_config any_errors_fatal: true roles: + - role: os_firewall - role: openshift_etcd etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}" etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml index a5567dc62..5f8bb1c7a 100644 --- a/playbooks/common/openshift-etcd/scaleup.yml +++ b/playbooks/common/openshift-etcd/scaleup.yml @@ -28,6 +28,8 @@ delay: 10 until: etcd_add_check.rc == 0 roles: + - role: os_firewall + when: etcd_add_check.rc == 0 - role: openshift_etcd when: etcd_add_check.rc == 0 etcd_peers: "{{ groups.oo_etcd_to_config | union(groups.oo_new_etcd_to_config)| default([], true) }}" |