summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-12 13:29:42 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-12 13:29:42 -0400
commit7378ed78e5d3ce5d7ca40c4ee36828ff1b0302fc (patch)
tree9358bbb18ed5eb4b91bd86f34ab4e65da42964df
parente3c8b0065af5c7ecfc3746e65620ba7db0ebcf0e (diff)
downloadopenshift-7378ed78e5d3ce5d7ca40c4ee36828ff1b0302fc.tar.gz
openshift-7378ed78e5d3ce5d7ca40c4ee36828ff1b0302fc.tar.bz2
openshift-7378ed78e5d3ce5d7ca40c4ee36828ff1b0302fc.tar.xz
openshift-7378ed78e5d3ce5d7ca40c4ee36828ff1b0302fc.zip
Ensure docker is installed for containerized load balancers
Currently, containerized load balancers may not have docker configured by openshift-ansible. This commit ensures that containerized load balancers have the openshift_docker role applied. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496756
-rw-r--r--playbooks/common/openshift-loadbalancer/config.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/playbooks/common/openshift-loadbalancer/config.yml b/playbooks/common/openshift-loadbalancer/config.yml
index d4addedee..2a703cb61 100644
--- a/playbooks/common/openshift-loadbalancer/config.yml
+++ b/playbooks/common/openshift-loadbalancer/config.yml
@@ -9,6 +9,15 @@
installer_phase_loadbalancer: "In Progress"
aggregate: false
+- name: Configure firewall and docker for load balancers
+ hosts: oo_lb_to_config:!oo_masters_to_config:!oo_nodes_to_config
+ vars:
+ openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag }}"
+ roles:
+ - role: os_firewall
+ - role: openshift_docker
+ when: openshift.common.is_containerized | default(False) | bool and not skip_docker_role | default(False) | bool
+
- name: Configure load balancers
hosts: oo_lb_to_config
vars:
@@ -24,7 +33,6 @@
+ openshift_loadbalancer_additional_backends | default([]) }}"
openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag }}"
roles:
- - role: os_firewall
- role: openshift_loadbalancer
- role: tuned