diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-26 14:48:21 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-26 14:48:21 -0400 |
| commit | c934467629cdf1369c8e2a080a81dc54f154276a (patch) | |
| tree | 461895fc3d36e733feebf8a0aeb08344e115dd95 /roles/openshift_common | |
| parent | 2833d9a86a0e8dddc1cfb0c481d341498da0e0c1 (diff) | |
| parent | 927278059ae25e97ada2161903c571409c2bc151 (diff) | |
| download | openshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.gz openshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.bz2 openshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.xz openshift-c934467629cdf1369c8e2a080a81dc54f154276a.zip | |
Merge pull request #1809 from abutcher/portal-net
BZ 1330357: Fail to deploy pod after installing env with openshift_master_portal_net='172.31.0.0/16'
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 1 |
1 files changed, 0 insertions, 1 deletions
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 |