diff options
| author | yfauser <yfauser@vmware.com> | 2016-10-30 22:58:38 +0100 |
|---|---|---|
| committer | yfauser <yfauser@vmware.com> | 2016-11-08 10:37:24 -0800 |
| commit | 0f10854a7d6f5a93cc9cbcc922c7157ed712df54 (patch) | |
| tree | a6f5053f70fb5052a72812110edd5beca99b3dec /roles/openshift_facts/tasks | |
| parent | a10e68b03db0e318e960a2f13f5f30ccb59b8d09 (diff) | |
| download | openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.tar.gz openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.tar.bz2 openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.tar.xz openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.zip | |
Change to allow cni deployments without openshift SDN
The roles/openshift_facts main task did not pass the cni plugin variable to the later role playbooks.
The master.yaml and node.yaml templates did not allow for a cni configuration without either installing openshift sdn or nuage.
This change will allow to use os_sdn_network_plugin_name=cni and set openshift_use_openshift_sdn=false for deployments that use a cni plugin that doesn't need and want openshift sdn to be installed
Diffstat (limited to 'roles/openshift_facts/tasks')
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index b0785a9e4..4d4a232cc 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -38,6 +38,8 @@ no_proxy: "{{ openshift_no_proxy | default(None) }}" generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}" no_proxy_internal_hostnames: "{{ openshift_no_proxy_internal_hostnames | default(None) }}" + sdn_network_plugin_name: "{{ os_sdn_network_plugin_name | default(None) }}" + use_openshift_sdn: "{{ openshift_use_openshift_sdn | default(None) }}" - name: Set repoquery command set_fact: |