Allow keystone endpoint_type interpolation for Neutron models
- Add 'endpoint_type' identity parameter
- Set 'endpoint_type: internal' as a
default parameter for 'service' reclass model (/metadata/)
Change-Id: If328588f2a6f324aec1df7b4ba7ba03ce9431855
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 2a235c1..eaa8707 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -3,6 +3,8 @@
classes:
- service.neutron.support
parameters:
+ _param:
+ keystone_neutron_endpoint_type: internal
neutron:
server:
enabled: true
@@ -26,6 +28,7 @@
user: neutron
password: ${_param:keystone_neutron_password}
tenant: service
+ endpoint_type: ${_param:keystone_neutron_endpoint_type}
message_queue:
engine: rabbitmq
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/control/container.yml b/metadata/service/control/container.yml
index 76931da..bca3d9e 100644
--- a/metadata/service/control/container.yml
+++ b/metadata/service/control/container.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ keystone_neutron_endpoint_type: internal
kubernetes:
control:
configmap:
@@ -29,6 +31,7 @@
user: neutron
password: ${_param:keystone_neutron_password}
tenant: service
+ endpoint_type: ${_param:keystone_neutron_endpoint_type}
message_queue:
engine: rabbitmq
host: ${_param:rabbitmq_service_host}
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index ea2c0f7..3be2831 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -3,6 +3,8 @@
classes:
- service.neutron.support
parameters:
+ _param:
+ keystone_neutron_endpoint_type: internal
neutron:
server:
enabled: true
@@ -29,6 +31,7 @@
user: neutron
password: ${_param:keystone_neutron_password}
tenant: service
+ endpoint_type: ${_param:keystone_neutron_endpoint_type}
message_queue:
engine: rabbitmq
host: ${_param:single_address}