Change default OCCM internal and public networks variables to empty l…

…ists (#7380) Signed-off-by: Mikael Johansson <[email protected]>
kubernetes-sigs · Mar 18, 2021 · f103ac7 · f103ac7
1 parent 274e06a
commit f103ac7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/docs/openstack.md b/docs/openstack.md
@@ -118,10 +118,8 @@ The new cloud provider is configured to have Octavia by default in Kubespray.
 
   ```yaml
   external_openstack_network_ipv6_disabled: false
-  external_openstack_network_internal_networks:
-  - ""
-  external_openstack_network_public_networks:
-  - ""
+  external_openstack_network_internal_networks: []
+  external_openstack_network_public_networks: []
   ```
 
 - You can override the default OpenStack metadata configuration (see [#6338](https://github.com/kubernetes-sigs/kubespray/issues/6338) for explanation):

diff --git a/inventory/sample/group_vars/all/openstack.yml b/inventory/sample/group_vars/all/openstack.yml
@@ -29,10 +29,8 @@
 # external_openstack_lbaas_manage_security_groups: false
 # external_openstack_lbaas_internal_lb: false
 # external_openstack_network_ipv6_disabled: false
-# external_openstack_network_internal_networks:
-#   - ""
-# external_openstack_network_public_networks:
-#   - ""
+# external_openstack_network_internal_networks: []
+# external_openstack_network_public_networks: []
 # external_openstack_metadata_search_order: "configDrive,metadataService"
 
 ## Application credentials to authenticate against Keystone API

diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
@@ -387,10 +387,8 @@ external_openstack_lbaas_monitor_timeout: "30s"
 external_openstack_lbaas_monitor_max_retries: "3"
 external_openstack_network_ipv6_disabled: false
 external_openstack_lbaas_use_octavia: false
-external_openstack_network_internal_networks:
-- ""
-external_openstack_network_public_networks:
-- ""
+external_openstack_network_internal_networks: []
+external_openstack_network_public_networks: []
 
 ## List of authorization modes that must be configured for
 ## the k8s cluster. Only 'AlwaysAllow', 'AlwaysDeny', 'Node' and