Browse Source

Move os_sdn_network_plugin_name into openshift_facts

Reduce places where we're potentially defining different defaults
Scott Dodson 6 years ago
parent
commit
c314c65dba

+ 1 - 1
roles/openshift_control_plane/defaults/main.yml

@@ -111,7 +111,7 @@ r_openshift_master_use_kuryr: "{{ r_openshift_master_use_kuryr_default }}"
 r_openshift_master_data_dir_default: "{{ openshift_data_dir | default('/var/lib/origin') }}"
 r_openshift_master_data_dir: "{{ r_openshift_master_data_dir_default }}"
 
-r_openshift_master_sdn_network_plugin_name_default: "{{ os_sdn_network_plugin_name | default('redhat/openshift-ovs-subnet') }}"
+r_openshift_master_sdn_network_plugin_name_default: "{{ os_sdn_network_plugin_name }}"
 r_openshift_master_sdn_network_plugin_name: "{{ r_openshift_master_sdn_network_plugin_name_default }}"
 
 openshift_master_use_persistentlocalvolumes: "{{ openshift_persistentlocalstorage_enabled | default(False) | bool }}"

+ 1 - 0
roles/openshift_facts/defaults/main.yml

@@ -118,6 +118,7 @@ openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_typ
 openshift_master_api_port: "8443"
 openshift_ca_host: "{{ groups.oo_first_master.0 }}"
 openshift_use_openshift_sdn: true
+os_sdn_network_plugin_name: "redhat/openshift-ovs-subnet"
 
 openshift_node_groups:
   - name: node-config-master

+ 1 - 1
roles/openshift_node/defaults/main.yml

@@ -181,7 +181,7 @@ journald_vars_to_replace:
 openshift_node_use_openshift_sdn_default: "{{ openshift_use_openshift_sdn | default(True) }}"
 openshift_node_use_openshift_sdn: "{{ openshift_node_use_openshift_sdn_default }}"
 
-openshift_node_sdn_network_plugin_name_default: "{{ os_sdn_network_plugin_name | default('redhat/openshift-ovs-subnet') }}"
+openshift_node_sdn_network_plugin_name_default: "{{ os_sdn_network_plugin_name }}"
 openshift_node_sdn_network_plugin_name: "{{ openshift_node_sdn_network_plugin_name_default }}"
 
 openshift_node_use_calico_default: "{{ openshift_use_calico | default(False) }}"

+ 1 - 1
roles/openshift_node_group/defaults/main.yml

@@ -3,7 +3,7 @@ openshift_use_crio: False
 l_crio_var_sock: "/var/run/crio/crio.sock"
 
 openshift_node_group_cloud_provider: "{{ openshift_cloudprovider_kind | default('') }}"
-openshift_node_group_network_plugin_default: "{{ os_sdn_network_plugin_name | default('redhat/openshift-ovs-subnet') }}"
+openshift_node_group_network_plugin_default: "{{ os_sdn_network_plugin_name }}"
 openshift_node_group_network_plugin: "{{ openshift_node_group_network_plugin_default }}"
 openshift_node_group_node_data_dir_default: "{{ openshift_data_dir | default('/var/lib/origin') }}"
 openshift_node_group_node_data_dir: "{{ openshift_node_group_node_data_dir_default }}"

+ 0 - 5
roles/openshift_service_catalog/defaults/main.yml

@@ -1,11 +1,6 @@
 ---
 openshift_service_catalog_remove: false
 openshift_service_catalog_async_bindings_enabled: true
-
-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"
-
 openshift_service_catalog_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'service-catalog') }}"
 
 # Number of retries when waiting for the service catalog healthz to return 'ok' (retried every 10 seconds)