From f103ac764079a5ee9a1aee36e046a8ac2efec2a6 Mon Sep 17 00:00:00 2001 From: Mikael Johansson Date: Fri, 19 Mar 2021 00:52:36 +0100 Subject: [PATCH] Change default OCCM internal and public networks variables to empty lists (#7380) Signed-off-by: Mikael Johansson --- docs/openstack.md | 6 ++---- inventory/sample/group_vars/all/openstack.yml | 6 ++---- roles/kubespray-defaults/defaults/main.yaml | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/docs/openstack.md b/docs/openstack.md index 9acca4ed8..d15a3ef9c 100644 --- 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 index ce22e12ee..7835664e6 100644 --- 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 index fd388b493..f62a9848c 100644 --- 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