k8s OS cloud provider net options support
Add support for additional networking options required to properly configure
Kubernetes OpenStack cloud provider
Related bug: PROD-25969 (PROD:25969)
Change-Id: Id30c8eb1937a54d4b2967acad1c744cf4de94e0a
(cherry picked from commit 83a9250c890b8cd186280dafcfa88f11f0d1e2dc)
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 0c69c9e..ec9a7ec 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -122,8 +122,8 @@
# OpenStack cloud provider
- kubernetes_openstack_provider_binary: ${_param:kubernetes_openstack_provider_repo}/openstack-cloud-controller-manager_v0.3.0-1_1543239267245
- kubernetes_openstack_provider_binary_hash: md5=0d85b5877e9872690390f5b87e45efba
+ kubernetes_openstack_provider_binary: ${_param:kubernetes_openstack_provider_repo}/openstack-cloud-controller-manager_v0.3.0-2_1549884015986
+ kubernetes_openstack_provider_binary_hash: md5=fd19a97527009aac72de7997744885fb
kubernetes_openstack_provider_cloud_user: admin
kubernetes_openstack_provider_cloud_password: secret
kubernetes_openstack_provider_cloud_auth_url: http://127.0.0.1:5000/v3
@@ -132,6 +132,8 @@
kubernetes_openstack_provider_cloud_region: RegionOne
kubernetes_openstack_provider_lbaas_subnet_id: subnet_id
kubernetes_openstack_provider_floating_net_id: floating_net_id
+ kubernetes_openstack_provider_internal_net_name: internal_net_name
+ kubernetes_openstack_provider_public_net_name: public_net_name
linux:
@@ -171,6 +173,8 @@
region: ${_param:kubernetes_openstack_provider_cloud_region}
subnet_id: ${_param:kubernetes_openstack_provider_lbaas_subnet_id}
floating_net_id: ${_param:kubernetes_openstack_provider_floating_net_id}
+ internal_net_name: ${_param:kubernetes_openstack_provider_internal_net_name}
+ public_net_name: ${_param:kubernetes_openstack_provider_public_net_name}
addons:
dashboard:
enabled: ${_param:kubernetes_dashboard_enabled}