diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-01-10 01:17:23 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-01 09:29:13 -0500 |
| commit | 57159f68031aeb08c757a0f17ec3c2876947fc62 (patch) | |
| tree | 87df7dd639b0e98fcbc40ee14a4cc973500b73ec /playbooks/common | |
| parent | 904ad2421f55248c1863cc1902fa4e58dafc657e (diff) | |
| download | openshift-57159f68031aeb08c757a0f17ec3c2876947fc62.tar.gz openshift-57159f68031aeb08c757a0f17ec3c2876947fc62.tar.bz2 openshift-57159f68031aeb08c757a0f17ec3c2876947fc62.tar.xz openshift-57159f68031aeb08c757a0f17ec3c2876947fc62.zip | |
infra_node fixes
- openshift_master role update
- infra_nodes was previously being set to num_infra, which is an integer
value when using the cloud providers, added a new variable osm_infra_nodes
that is expected to be a list of hosts
- if openshift_infra_nodes is not already set, create it from the nodes that
have the region=infra label.
- Cloud provider config playbook updates
- override openshift_router_selector for cloud providers to avoid using the
default of 'region=infra' when deployment_type is not 'online'
- Set openshift_infra_nodes to g_infra_host for cloud providers
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 12497bf94..6f86703d6 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -164,6 +164,11 @@ | list ) }}" master_cert_subdir: master-{{ openshift.common.hostname }} master_cert_config_dir: "{{ openshift.common.config_base }}/master" + - set_fact: + openshift_infra_nodes: "{{ hostvars | oo_select_keys(groups['nodes']) + | oo_nodes_with_label('region', 'infra') + | oo_collect('inventory_hostname') }}" + when: openshift_infra_nodes is not defined - name: Configure master certificates hosts: oo_first_master |