diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-08-25 00:10:54 -0400 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-09-06 13:59:38 -0400 |
commit | 8bf97723ceaca02fe12b86466f8383aa211ead5e (patch) | |
tree | e73adc1d43d5a07b0e6c941d8e555919e3266fed /roles/openshift_service_catalog | |
parent | b5cf769b97691d75e07d1e0e3b29ecbc31ba32ea (diff) | |
download | openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.gz openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.bz2 openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.xz openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.zip |
Remove openshift-common
Most of this role's purpose was to set facts. The vast majority
of these facts were simply redefining user-supplied variables.
This commit also removes various artifacts leftover from
previous versions, as well as variables that seem to be
entirely unused.
Diffstat (limited to 'roles/openshift_service_catalog')
-rw-r--r-- | roles/openshift_service_catalog/defaults/main.yml | 4 | ||||
-rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_service_catalog/defaults/main.yml b/roles/openshift_service_catalog/defaults/main.yml index 01ee2544d..7c848cb12 100644 --- a/roles/openshift_service_catalog/defaults/main.yml +++ b/roles/openshift_service_catalog/defaults/main.yml @@ -1,3 +1,7 @@ --- openshift_service_catalog_remove: false openshift_service_catalog_nodeselector: {"openshift-infra": "apiserver"} + +openshift_use_openshift_sdn: True +# os_sdn_network_plugin_name: "{% if openshift_use_openshift_sdn %}redhat/openshift-ovs-subnet{% else %}{% endif %}" +os_sdn_network_plugin_name: "redhat/openshift-ovs-subnet" diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index 64f94347b..746c73eaf 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -28,7 +28,7 @@ - name: Make kube-service-catalog project network global command: > oc adm pod-network make-projects-global kube-service-catalog - when: os_sdn_network_plugin_name | default('') == 'redhat/openshift-ovs-multitenant' + when: os_sdn_network_plugin_name == 'redhat/openshift-ovs-multitenant' - include: generate_certs.yml |