diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-08-23 17:57:12 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-08-29 10:26:27 -0400 |
| commit | 3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6 (patch) | |
| tree | eda62eecedf4e4305f7c57f1f85d92e6014aa811 /playbooks/common | |
| parent | f2ae4eeecb94d5194131a4c31c2beea5071d84b9 (diff) | |
| download | openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.tar.gz openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.tar.bz2 openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.tar.xz openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.zip | |
Merging openshift_node with openshift bootstrap.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/evaluate_groups.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_facts.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml index c56b07037..a9766c66f 100644 --- a/playbooks/common/openshift-cluster/evaluate_groups.yml +++ b/playbooks/common/openshift-cluster/evaluate_groups.yml @@ -117,7 +117,7 @@ add_host: name: "{{ item }}" groups: oo_etcd_hosts_to_backup - with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config | length > 0 else groups.oo_first_master }}" + with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config | length > 0 else (groups.oo_first_master | default([])) }}" changed_when: False - name: Evaluate oo_nodes_to_config @@ -173,5 +173,5 @@ groups: oo_etcd_to_migrate ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" ansible_become: "{{ g_sudo | default(omit) }}" - with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config | default([]) | length != 0 else groups.oo_first_master }}" + with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config | default([]) | length != 0 else (groups.oo_first_master |default([]))}}" changed_when: no diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml index 65be436c6..9eaf3bc34 100644 --- a/playbooks/common/openshift-cluster/initialize_facts.yml +++ b/playbooks/common/openshift-cluster/initialize_facts.yml @@ -157,4 +157,4 @@ - name: initialize_facts set_fact on openshift_docker_hosted_registry_network set_fact: - openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" + openshift_docker_hosted_registry_network: "{{ '' if 'oo_first_master' not in groups else hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" |