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-master | |
| 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-master')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index b30450def..cd25dd211 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -180,6 +180,7 @@ | oo_collect('openshift.common.ip') | default([]) | join(',') }}" roles: + - role: os_firewall - role: openshift_master openshift_ca_host: "{{ groups.oo_first_master.0 }}" openshift_master_etcd_hosts: "{{ hostvars diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index bc61ee9bb..6ad4cde65 100644 --- a/playbooks/common/openshift-master/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -1,11 +1,4 @@ --- -- include: ../openshift-cluster/evaluate_groups.yml - -- name: Gather facts - hosts: oo_etcd_to_config:oo_masters_to_config:oo_nodes_to_config - roles: - - openshift_facts - - name: Update master count hosts: oo_masters:!oo_masters_to_config serial: 1 @@ -50,16 +43,6 @@ delay: 1 changed_when: false -- name: Configure docker hosts - hosts: oo_masters_to_config:oo_nodes_to_config - vars: - docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split }}" - docker_insecure_registries: "{{ lookup('oo_option', 'docker_insecure_registries') | oo_split }}" - docker_blocked_registries: "{{ lookup('oo_option', 'docker_blocked_registries') | oo_split }}" - roles: - - openshift_facts - - openshift_docker - - name: Disable excluders hosts: oo_masters_to_config tags: |