Add additional metadata configuration option to external Openstack CCM (

kubernetes-sigs#6338)
Sryther · Jul 1, 2020 · 8144b2f · 8144b2f
1 parent 2a82dff
commit 8144b2f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/docs/openstack.md b/docs/openstack.md
@@ -108,5 +108,11 @@ The new cloud provider is configured to have Octavia by default in Kubespray.
   - ""
   ```
 
+- You can override the default OpenStack metadata configuration (see [#6338](https://github.com/kubernetes-sigs/kubespray/issues/6338) for explanation):
+
+  ```yaml
+  external_openstack_metadata_search_order: "configDrive,metadataService"
+  ```
+
 - Run `source path/to/your/openstack-rc` to read your OpenStack credentials like `OS_AUTH_URL`, `OS_USERNAME`, `OS_PASSWORD`, etc. Those variables are used for accessing OpenStack from the external cloud provider.
 - Run the `cluster.yml` playbook
diff --git a/inventory/sample/group_vars/all/openstack.yml b/inventory/sample/group_vars/all/openstack.yml
@@ -33,6 +33,7 @@
 #   - ""
 # external_openstack_network_public_networks:
 #   - ""
+# external_openstack_metadata_search_order: "configDrive,metadataService"
 
 ## The tag of the external OpenStack Cloud Controller image
 # external_openstack_cloud_controller_image_tag: "latest"

diff --git a/...tes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2 b/...tes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2
@@ -57,3 +57,6 @@ internal-network-name="{{ network_name }}"
 {% for network_name in external_openstack_network_public_networks %}
 public-network-name="{{ network_name }}"
 {% endfor %}
+
+[Metadata]
+search-order="{{ external_openstack_metadata_search_order }}"
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
@@ -363,6 +363,7 @@ external_openstack_network_internal_networks:
   - ""
 external_openstack_network_public_networks:
   - ""
+external_openstack_metadata_search_order: "configDrive,metadataService"
 
 ## List of authorization modes that must be configured for
 ## the k8s cluster. Only 'AlwaysAllow', 'AlwaysDeny', 'Node' and