diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-04-26 11:34:16 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-04-26 11:34:16 -0400 |
| commit | 927278059ae25e97ada2161903c571409c2bc151 (patch) | |
| tree | 6c7ba3766c760385865f8af008a591a2b3a2cc78 | |
| parent | ca88d5ca2357d5342f4dbb357aa17b4164a2c18e (diff) | |
| download | openshift-927278059ae25e97ada2161903c571409c2bc151.tar.gz openshift-927278059ae25e97ada2161903c571409c2bc151.tar.bz2 openshift-927278059ae25e97ada2161903c571409c2bc151.tar.xz openshift-927278059ae25e97ada2161903c571409c2bc151.zip | |
Move portal_net from openshift_common to openshift_facts.
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 537de4f5c..060b5aa0d 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -50,10 +50,6 @@ when: openshift_hosted_metrics_resolution is not defined roles: - openshift_facts - # TODO: Remove openshift_common from this roles list once - # openshift_master_certificates uses delegate_to and is applied to - # all masters rather than just the first. - - openshift_common post_tasks: - openshift_facts: role: master diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index d5166b52e..4ec255dbc 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -27,7 +27,6 @@ use_nuage: "{{ openshift_use_nuage | default(None) }}" use_manageiq: "{{ openshift_use_manageiq | default(None) }}" data_dir: "{{ openshift_data_dir | default(None) }}" - portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}" use_dnsmasq: "{{ openshift_use_dnsmasq | default(None) }}" # Using oo_image_tag_to_rpm_version here is a workaround for how diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index 7510e4e39..8077c0d97 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -33,6 +33,7 @@ is_containerized: "{{ l_is_containerized | default(None) }}" public_hostname: "{{ openshift_public_hostname | default(None) }}" public_ip: "{{ openshift_public_ip | default(None) }}" + portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}" # had to be done outside of the above because hostname isn't yet set - name: Gather hostnames for proxy configuration |