summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-12 18:12:33 -0700
committerGitHub <noreply@github.com>2017-10-12 18:12:33 -0700
commita36fec164e9643c8b2ffcfd960b539d963660992 (patch)
tree9ae5ec0c3d4e9e4fd4a92b79585feafadddc6f89 /playbooks
parent7c779b36cc6fc9687b577f2ddda33909b25860e7 (diff)
parent7378ed78e5d3ce5d7ca40c4ee36828ff1b0302fc (diff)
downloadopenshift-a36fec164e9643c8b2ffcfd960b539d963660992.tar.gz
openshift-a36fec164e9643c8b2ffcfd960b539d963660992.tar.bz2
openshift-a36fec164e9643c8b2ffcfd960b539d963660992.tar.xz
openshift-a36fec164e9643c8b2ffcfd960b539d963660992.zip
Merge pull request #5740 from mgugino-upstream-stage/ensure_docker_containerized_lb
Automatic merge from submit-queue. 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
Diffstat (limited to 'playbooks')
-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