diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
| commit | 9410cdff9342fae80a3149c530b819e473996cce (patch) | |
| tree | cf26be9b05f3b97dbdafb7bae109b0707da0a0d4 /playbooks/common/openshift-master/config.yml | |
| parent | a2b745039bce597d419b03fdce39b4c6c69139f6 (diff) | |
| parent | bdedb63403ea582c4aaa5f56caed302f51744de2 (diff) | |
| download | openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.gz openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.bz2 openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.xz openshift-9410cdff9342fae80a3149c530b819e473996cce.zip | |
Merge pull request #1247 from openshift/master
Merge master into prod
Diffstat (limited to 'playbooks/common/openshift-master/config.yml')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 0df03f194..9f8443599 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -43,6 +43,7 @@ api_port: "{{ openshift_master_api_port | default(None) }}" api_url: "{{ openshift_master_api_url | default(None) }}" api_use_ssl: "{{ openshift_master_api_use_ssl | default(None) }}" + controllers_port: "{{ openshift_master_controllers_port | default(None) }}" public_api_url: "{{ openshift_master_public_api_url | default(None) }}" cluster_hostname: "{{ openshift_master_cluster_hostname | default(None) }}" cluster_public_hostname: "{{ openshift_master_cluster_public_hostname | default(None) }}" @@ -218,6 +219,7 @@ hosts: oo_lb_to_config vars: sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" + haproxy_frontend_port: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_port }}" haproxy_frontends: - name: atomic-openshift-api mode: tcp |