diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-05-16 16:30:41 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-05-17 17:12:34 -0400 |
| commit | 6a16a03ec080dd0095399d9522be5c2607b2f88f (patch) | |
| tree | 1eef06b75e7e911c10dbca4fd1b8b0e9730f40f1 | |
| parent | 1826e93bcf2ba21f0c1c7368dffd091a8bfbf142 (diff) | |
| download | openshift-6a16a03ec080dd0095399d9522be5c2607b2f88f.tar.gz openshift-6a16a03ec080dd0095399d9522be5c2607b2f88f.tar.bz2 openshift-6a16a03ec080dd0095399d9522be5c2607b2f88f.tar.xz openshift-6a16a03ec080dd0095399d9522be5c2607b2f88f.zip | |
Fix rhel_subscribe
| -rw-r--r-- | playbooks/byo/rhel_subscribe.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml index 990ddd2f2..5702e960e 100644 --- a/playbooks/byo/rhel_subscribe.yml +++ b/playbooks/byo/rhel_subscribe.yml @@ -1,4 +1,8 @@ --- +- include: ../common/openshift-cluster/evaluate_groups.yml + vars_files: + - ../../byo/openshift-cluster/cluster_hosts.yml + - hosts: all vars: openshift_deployment_type: "{{ deployment_type }}" diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index ce410d1d5..47a82a968 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -42,8 +42,8 @@ https_proxy: "{{ openshift_https_proxy | default(None) }}" no_proxy: "{{ openshift_no_proxy | default(None) }}" generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}" - no_proxy_internal_hostnames: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] - | union(groups['oo_masters_to_config']) + no_proxy_internal_hostnames: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | default([]) + | union(groups['oo_masters_to_config'] | default([]) ) | union(groups['oo_etcd_to_config'] | default([]))) | oo_collect('openshift.common.hostname') | default([]) | join (',') }}" |