diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-26 14:39:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 14:39:11 -0400 |
| commit | efb0483474caa577c65d58d9a7d5a152052825ed (patch) | |
| tree | 9268ad6653e3789b4cdae41660a398636504cffb | |
| parent | f91b0fc1aca24e551b80d0e81f098fc35793bb16 (diff) | |
| parent | f5a610764e20e214d99bd663f8aeb7700777df5d (diff) | |
| download | openshift-efb0483474caa577c65d58d9a7d5a152052825ed.tar.gz openshift-efb0483474caa577c65d58d9a7d5a152052825ed.tar.bz2 openshift-efb0483474caa577c65d58d9a7d5a152052825ed.tar.xz openshift-efb0483474caa577c65d58d9a7d5a152052825ed.zip | |
Merge pull request #4816 from abutcher/containerized-lb-image-tag
Pass first master's openshift_image_tag to openshift_loadbalancer for containerized haproxy installation.
| -rw-r--r-- | playbooks/common/openshift-loadbalancer/config.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/README.md | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/common/openshift-loadbalancer/config.yml b/playbooks/common/openshift-loadbalancer/config.yml index c414913bf..2dacc1218 100644 --- a/playbooks/common/openshift-loadbalancer/config.yml +++ b/playbooks/common/openshift-loadbalancer/config.yml @@ -12,5 +12,6 @@ openshift_use_nuage | default(false), nuage_mon_rest_server_port | default(none))) + openshift_loadbalancer_additional_backends | default([]) }}" + openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag }}" roles: - role: openshift_loadbalancer diff --git a/roles/openshift_loadbalancer/README.md b/roles/openshift_loadbalancer/README.md index bea4c509b..330895f20 100644 --- a/roles/openshift_loadbalancer/README.md +++ b/roles/openshift_loadbalancer/README.md @@ -25,6 +25,7 @@ From this role: | openshift_loadbalancer_default_maxconn | 20000 | Maximum per-process number of concurrent connections. | | openshift_loadbalancer_frontends | none | List of frontends. See example below. | | openshift_loadbalancer_backends | none | List of backends. See example below. | +| openshift_image_tag | none | Image tag for containerized haproxy image. | Dependencies ------------ @@ -64,6 +65,7 @@ Example Playbook - name: master3 address: "192.168.122.223:8443" opts: check + openshift_image_tag: v3.6.153 ``` License |