diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-24 12:06:12 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-24 12:06:12 -0500 |
| commit | 91b3a5cfc1c86bf2a7ed8c12abaee418a3bd3b8f (patch) | |
| tree | 5a6900364ad504b386743370ad401419ea5a2d98 | |
| parent | c54ad32e37ff11ae962bbf6bc48d3f5176383bdd (diff) | |
| parent | 6a39578bb89ec2fe018b78a9cb2f5ee7de6e99c5 (diff) | |
| download | openshift-91b3a5cfc1c86bf2a7ed8c12abaee418a3bd3b8f.tar.gz openshift-91b3a5cfc1c86bf2a7ed8c12abaee418a3bd3b8f.tar.bz2 openshift-91b3a5cfc1c86bf2a7ed8c12abaee418a3bd3b8f.tar.xz openshift-91b3a5cfc1c86bf2a7ed8c12abaee418a3bd3b8f.zip | |
Merge pull request #1103 from abutcher/lb-no-docker
Remove lb from docker hosts.
| -rw-r--r-- | playbooks/common/openshift-docker/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/common/openshift-docker/config.yml b/playbooks/common/openshift-docker/config.yml index f838dd66c..092d5533c 100644 --- a/playbooks/common/openshift-docker/config.yml +++ b/playbooks/common/openshift-docker/config.yml @@ -1,5 +1,5 @@ - name: Configure docker hosts - hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config:oo_lb_to_config + hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_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 }}" diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 3598bdad7..fae37d70c 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -232,6 +232,7 @@ balance: source servers: "{{ hostvars.localhost.haproxy_backend_servers }}" roles: + - role: openshift_facts - role: haproxy when: groups.oo_masters_to_config | length > 1 |