diff options
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-loadbalancer/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/scaleup.yml | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/playbooks/common/openshift-loadbalancer/config.yml b/playbooks/common/openshift-loadbalancer/config.yml index e3567552e..c414913bf 100644 --- a/playbooks/common/openshift-loadbalancer/config.yml +++ b/playbooks/common/openshift-loadbalancer/config.yml @@ -2,12 +2,12 @@ - name: Configure load balancers hosts: oo_lb_to_config vars: - openshift_loadbalancer_frontends: "{{ (openshift_master_api_port | default(8843) + openshift_loadbalancer_frontends: "{{ (openshift_master_api_port | default(8443) | oo_openshift_loadbalancer_frontends(hostvars | oo_select_keys(groups['oo_masters']), openshift_use_nuage | default(false), nuage_mon_rest_server_port | default(none))) + openshift_loadbalancer_additional_frontends | default([]) }}" - openshift_loadbalancer_backends: "{{ (openshift_master_api_port | default(8843) + openshift_loadbalancer_backends: "{{ (openshift_master_api_port | default(8443) | oo_openshift_loadbalancer_backends(hostvars | oo_select_keys(groups['oo_masters']), openshift_use_nuage | default(false), nuage_mon_rest_server_port | default(none))) diff --git a/playbooks/common/openshift-node/scaleup.yml b/playbooks/common/openshift-node/scaleup.yml index 1d79db353..bb3b1e780 100644 --- a/playbooks/common/openshift-node/scaleup.yml +++ b/playbooks/common/openshift-node/scaleup.yml @@ -6,6 +6,17 @@ roles: - openshift_facts +- name: Gather and set facts for first master + hosts: oo_first_master + vars: + openshift_master_count: "{{ groups.oo_masters | length }}" + pre_tasks: + - set_fact: + openshift_master_default_subdomain: "{{ lookup('oo_option', 'openshift_master_default_subdomain') | default(None, true) }}" + when: openshift_master_default_subdomain is not defined + roles: + - openshift_master_facts + - name: Configure docker hosts hosts: oo_nodes_to_config vars: |