C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) (#6339)

Browse source 
* Add additional metadata configuration option to external Openstack CCM (kubernetes-sigs#6338)

* Set the variable external_openstack_metadata_search_order undefined by default
This commit is contained in:
Paul Rey 2020-07-01 13:52:17 +02:00 committed by GitHub
parent 2a82dff3ae
commit bcac3c62a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/openstack.md
View file

@ -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 `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 - Run the `cluster.yml` playbook

1
inventory/sample/group_vars/all/openstack.yml
View file

@ -33,6 +33,7 @@
# - "" # - ""
# external_openstack_network_public_networks: # external_openstack_network_public_networks:
# - "" # - ""
# external_openstack_metadata_search_order: "configDrive,metadataService"
## The tag of the external OpenStack Cloud Controller image ## The tag of the external OpenStack Cloud Controller image
# external_openstack_cloud_controller_image_tag: "latest" # external_openstack_cloud_controller_image_tag: "latest"

5
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2
View file

@ -57,3 +57,8 @@ internal-network-name="{{ network_name }}"
{% for network_name in external_openstack_network_public_networks %} {% for network_name in external_openstack_network_public_networks %}
public-network-name="{{ network_name }}" public-network-name="{{ network_name }}"
{% endfor %} {% endfor %}
[Metadata]
{% if external_openstack_metadata_search_order is defined %}
search-order="{{ external_openstack_metadata_search_order }}"
{% endif %}