Helm charts for cinder keystone v2 endpoints

Helm charts for cinder keystone v2 public, internal, and admin
endpoints. Also includes the keystone v2 service

Change-Id: Ib7d7801417edfec2c1737e35cef24c756b851357
Partially-Implements: blueprint helm-microservices

helm/all_values.yaml

@@ -407,14 +407,26 @@ cinder-create-keystone-endpoint-admin:
         cinder_admin_service: cinder-api
         cinder_api_port: 8776
 
+cinder-create-keystone-endpoint-adminv2:
+        cinder_admin_service: cinder-api
+        cinder_api_port: 8776
+
 cinder-create-keystone-endpoint-public:
         kolla_kubernetes_external_vip:
         cinder_api_port: 8776
 
+cinder-create-keystone-endpoint-publicv2:
+        kolla_kubernetes_external_vip:
+        cinder_api_port: 8776
+
 cinder-create-keystone-endpoint-internal:
         cinder_internal_service: cinder-api
         cinder_api_port: 8776
 
+cinder-create-keystone-endpoint-internalv2:
+        cinder_internal_service: cinder-api
+        cinder_api_port: 8776
+
 iscsid:
         selector_key: kolla_compute
         selector_value: "true"

helm/kolla-common/templates/_common_create_keystone_endpoint.yaml

@@ -26,7 +26,7 @@ spec:
           args:
             - |
                 pip install --upgrade python-openstackclient;
-                /usr/bin/openstack endpoint create --region {{ .Values.region | quote }} {{ .serviceType | quote }} {{ .interface | quote }} {{ .endpointURLFull | quote }};
+                /usr/bin/openstack endpoint create --region {{ .Values.region | quote }} {{ printf "%s%s" .serviceType $postfix | quote }} {{ .interface | quote }} {{ .endpointURLFull | quote }};
           volumeMounts:
 {{ include "common_volume_mounts" . | indent 12 }}
           env:

helm/kolla-common/templates/_common_create_keystone_service.yaml

@@ -26,7 +26,7 @@ spec:
           args:
             - |
                 pip install --upgrade python-openstackclient;
-                /usr/bin/openstack service create --name {{ .serviceName | quote }} --description {{ .description | quote }} {{ .serviceType }}
+                /usr/bin/openstack service create --name {{ printf "%s%s" .serviceName $postfix | quote }} --description {{ .description | quote }} {{ printf "%s%s" .serviceType $postfix | quote }}
           volumeMounts:
 {{ include "common_volume_mounts" . | indent 12 }}
           env:

helm/microservice/cinder-create-keystone-endpoint-adminv2/Chart.yaml

@@ -0,0 +1,12 @@
+name: cinder-create-keystone-endpoint-adminv2
+version: 3.0.0-1 #FIXME make this changable
+description: Helm chart for creating cinder admin keystone v2 endpoint
+keywords:
+  - openstack
+  - cinder
+  - keystone-endpoint-admin
+  - v2
+sources:
+  - http://github.com/openstack
+engine: gotpl
+#icon: A URL to an SVG or PNG image to be used as an icon (optional). make this point to the new project icons when ready

helm/microservice/cinder-create-keystone-endpoint-adminv2/templates/cinder-create-keystone-endpoint-adminv2.yaml

@@ -0,0 +1,13 @@
+{{- $resourceName := "cinder-create-keystone-endpoint-adminv2" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "cinder" }}
+{{- $serviceType := "volume" }}
+{{- $interface := "admin" }}
+{{- $cinderAdminEndpointBuilt := printf "http://%s:%1.f/v2/%%(tenant_id)s" .Values.cinder_admin_service .Values.cinder_api_port }}
+{{- $endpointURLFull := .Values.cinder_admin_endpoint | default $cinderAdminEndpointBuilt }}
+{{- $postfix := "v2" }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "postfix" $postfix "Release" .Release "Values" .Values }}
+{{- include "common_create_keystone_endpoint" $env }}
+{{- end }}
+

helm/microservice/cinder-create-keystone-endpoint-internalv2/Chart.yaml

@@ -0,0 +1,12 @@
+name: cinder-create-keystone-endpoint-internalv2
+version: 3.0.0-1 #FIXME make this changable
+description: Helm chart for creating cinder internal keystone v2 endpoint
+keywords:
+  - openstack
+  - cinder
+  - keystone-endpoint-internal
+  - v2
+sources:
+  - http://github.com/openstack
+engine: gotpl
+#icon: A URL to an SVG or PNG image to be used as an icon (optional). make this point to the new project icons when ready

helm/microservice/cinder-create-keystone-endpoint-internalv2/templates/cinder-create-keystone-endpoint-internalv2.yaml

@@ -0,0 +1,12 @@
+{{- $resourceName := "cinder-create-keystone-endpoint-internalv2" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "cinder" }}
+{{- $serviceType := "volume" }}
+{{- $interface := "internal" }}
+{{- $cinderInternalEndpointBuilt := printf "http://%s:%1.f/v2/%%(tenant_id)s" .Values.cinder_internal_service .Values.cinder_api_port }}
+{{- $endpointURLFull := .Values.cinder_internal_endpoint | default $cinderInternalEndpointBuilt }}
+{{- $postfix := "v2" }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "postfix" $postfix "Release" .Release "Values" .Values }}
+{{- include "common_create_keystone_endpoint" $env }}
+{{- end }}

helm/microservice/cinder-create-keystone-endpoint-publicv2/Chart.yaml

@@ -0,0 +1,12 @@
+name: cinder-create-keystone-endpoint-publicv2
+version: 3.0.0-1 #FIXME make this changable
+description: Helm chart for creating cinder public keystone v2 endpoint
+keywords:
+  - openstack
+  - cinder
+  - keystone-endpoint-public
+  - v2
+sources:
+  - http://github.com/openstack
+engine: gotpl
+#icon: A URL to an SVG or PNG image to be used as an icon (optional). make this point to the new project icons when ready

helm/microservice/cinder-create-keystone-endpoint-publicv2/templates/cinder-create-keystone-endpoint-publicv2.yaml

@@ -0,0 +1,12 @@
+{{- $resourceName := "cinder-create-keystone-endpoint-publicv2" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "cinder" }}
+{{- $serviceType := "volume" }}
+{{- $interface := "public" }}
+{{- $cinderPublicEndpointBuilt := printf "http://%s:%1.f/v2/%%(tenant_id)s" .Values.kolla_kubernetes_external_vip .Values.cinder_api_port }}
+{{- $endpointURLFull := .Values.cinder_public_endpoint | default $cinderPublicEndpointBuilt }}
+{{- $postfix := "v2" }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "postfix" $postfix "Release" .Release "Values" .Values }}
+{{- include "common_create_keystone_endpoint" $env }}
+{{- end }}

helm/microservice/cinder-create-keystone-servicev2/Chart.yaml

@@ -0,0 +1,12 @@
+name: cinder-create-keystone-servicev2
+version: 3.0.0-1 #FIXME make this changable
+description: FIXME
+keywords:
+  - openstack
+  - cinder
+  - keystone-service
+  - v2
+sources:
+  - http://github.com/openstack
+engine: gotpl
+#icon: A URL to an SVG or PNG image to be used as an icon (optional). make this point to the new project icons when ready

helm/microservice/cinder-create-keystone-servicev2/templates/cinder-create-keystone-servicev2.yaml

@@ -0,0 +1,11 @@
+{{- $resourceName := "cinder-create-keystone-servicev2" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "cinder" }}
+{{- $serviceType := "volume" }}
+{{- $description := "Openstack Block Storage" }}
+{{- $postfix := "v2" }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "description" $description "postfix" $postfix "Values" .Values }}
+{{- include "common_create_keystone_service" $env }}
+{{- end }}
+

tests/bin/ceph_workflow.sh

@@ -198,6 +198,9 @@ helm install kolla/glance-create-keystone-service --version 3.0.0-1 \
 helm install kolla/cinder-create-keystone-service --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-service --set "$common_vars"
 
+helm install kolla/cinder-create-keystone-servicev2 --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-servicev2 --set "$common_vars"
+
 helm install kolla/cinder-create-keystone-user --debug --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-user
 
@@ -213,12 +216,12 @@ helm install kolla/nova-create-keystone-service --debug --version 3.0.0-1 \
 helm install kolla/nova-create-keystone-user --debug --version 3.0.0-1 \
     --namespace kolla --name nova-create-keystone-user
 
-kollakube res create bootstrap \
-    cinder-create-keystone-endpoint-publicv2
-
 helm install kolla/cinder-create-keystone-endpoint-public --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-endpoint-public --set "$common_vars,kolla_kubernetes_external_vip=172.18.0.1"
 
+helm install kolla/cinder-create-keystone-endpoint-publicv2 --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-endpoint-publicv2 --set "$common_vars,kolla_kubernetes_external_vip=172.18.0.1"
+
 helm install kolla/glance-create-keystone-endpoint-public --version 3.0.0-1 \
     --namespace kolla --name glance-create-keystone-endpoint-public --set "$common_vars,kolla_kubernetes_external_vip=172.18.0.1"
 
@@ -234,9 +237,6 @@ helm install kolla/neutron-create-keystone-endpoint-admin --version 3.0.0-1 \
 
 $DIR/tools/wait_for_pods.sh kolla
 
-kollakube res delete bootstrap \
-    cinder-create-keystone-endpoint-publicv2
-
 for x in cinder glance neutron nova; do
     helm delete --purge $x-create-keystone-user
 done
@@ -257,16 +257,18 @@ helm install kolla/cinder-manage-db --version 3.0.0-1 \
     --namespace kolla \
     --name cinder-manage-db
 
-kollakube res create bootstrap \
-    cinder-create-keystone-endpoint-internalv2 \
-    cinder-create-keystone-endpoint-adminv2
-
 helm install kolla/cinder-create-keystone-endpoint-internal --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-endpoint-internal --set "$common_vars"
 
+helm install kolla/cinder-create-keystone-endpoint-internalv2 --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-endpoint-internalv2 --set "$common_vars"
+
 helm install kolla/cinder-create-keystone-endpoint-admin --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-endpoint-admin --set "$common_vars"
 
+helm install kolla/cinder-create-keystone-endpoint-adminv2 --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-endpoint-adminv2 --set "$common_vars"
+
 helm install kolla/glance-create-keystone-endpoint-internal --version 3.0.0-1 \
     --namespace kolla --name glance-create-keystone-endpoint-internal --set "$common_vars"
 
@@ -314,10 +316,6 @@ for x in nova-api cinder neutron glance; do
     helm delete --purge $x-manage-db
 done
 
-kollakube res delete bootstrap \
-    cinder-create-keystone-endpoint-internalv2 \
-    cinder-create-keystone-endpoint-adminv2
-
 for x in glance neutron cinder nova; do
     helm delete --purge $x-create-keystone-service
     helm delete --purge $x-create-keystone-endpoint-public
@@ -325,6 +323,11 @@ for x in glance neutron cinder nova; do
     helm delete --purge $x-create-keystone-endpoint-admin
 done
 
+helm delete --purge cinder-create-keystone-servicev2
+helm delete --purge cinder-create-keystone-endpoint-publicv2
+helm delete --purge cinder-create-keystone-endpoint-internalv2
+helm delete --purge cinder-create-keystone-endpoint-adminv2
+
 helm install kolla/cinder-volume-ceph --version 3.0.0-1 \
     --set "$common_vars,element_name=cinder" --namespace kolla \
     --name cinder-volume-ceph

tests/bin/ceph_workflow_service.sh

@@ -205,6 +205,9 @@ helm install kolla/glance-create-keystone-service --version 3.0.0-1 \
 helm install kolla/cinder-create-keystone-service --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-service --set "$common_vars"
 
+helm install kolla/cinder-create-keystone-service --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-servicev2 --set "$common_vars"
+
 helm install kolla/cinder-create-keystone-user --debug --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-user
 
@@ -218,11 +221,12 @@ helm install kolla/nova-create-keystone-user --debug --version 3.0.0-1 \
     --namespace kolla --name nova-create-keystone-user
 
 kollakube res create bootstrap \
-    nova-create-keystone-endpoint-public \
-    cinder-create-keystone-endpoint-publicv2
+    nova-create-keystone-endpoint-public
 
 helm install kolla/cinder-create-keystone-endpoint-public --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-endpoint-public --set "$common_vars,kolla_kubernetes_external_vip=172.18.0.1"
+helm install kolla/cinder-create-keystone-endpoint-publicv2 --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-endpoint-publicv2 --set "$common_vars,kolla_kubernetes_external_vip=172.18.0.1"
 
 helm install kolla/glance-create-keystone-endpoint-public --version 3.0.0-1 \
     --namespace kolla --name glance-create-keystone-endpoint-public --set "$common_vars,kolla_kubernetes_external_vip=172.18.0.1"
@@ -237,8 +241,7 @@ helm install kolla/neutron-create-keystone-endpoint-admin --version 3.0.0-1 \
 $DIR/tools/wait_for_pods.sh kolla
 
 kollakube res delete bootstrap \
-    nova-create-keystone-endpoint-public \
-    cinder-create-keystone-endpoint-publicv2
+    nova-create-keystone-endpoint-public
 
 for x in cinder glance neutron nova; do
     helm delete --purge $x-create-keystone-user
@@ -261,16 +264,20 @@ helm install kolla/cinder-manage-db --version 3.0.0-1 \
     --name cinder-manage-db
 
 kollakube res create bootstrap nova-create-keystone-endpoint-internal \
-    cinder-create-keystone-endpoint-internalv2 \
-    nova-create-keystone-endpoint-admin \
-    cinder-create-keystone-endpoint-adminv2
+    nova-create-keystone-endpoint-admin
 
 helm install kolla/cinder-create-keystone-endpoint-internal --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-endpoint-internal --set "$common_vars"
 
+helm install kolla/cinder-create-keystone-endpoint-internalv2 --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-endpoint-internalv2 --set "$common_vars"
+
 helm install kolla/cinder-create-keystone-endpoint-admin --version 3.0.0-1 \
     --namespace kolla --name cinder-create-keystone-endpoint-admin --set "$common_vars"
 
+helm install kolla/cinder-create-keystone-endpoint-adminv2 --version 3.0.0-1 \
+    --namespace kolla --name cinder-create-keystone-endpoint-adminv2 --set "$common_vars"
+
 helm install kolla/glance-create-keystone-endpoint-internal --version 3.0.0-1 \
     --namespace kolla --name glance-create-keystone-endpoint-internal --set "$common_vars"
 
@@ -314,9 +321,7 @@ done
 
 kollakube res delete bootstrap \
     nova-create-keystone-endpoint-internal \
-    cinder-create-keystone-endpoint-internalv2 \
     nova-create-keystone-endpoint-admin \
-    cinder-create-keystone-endpoint-adminv2
 
 for x in glance neutron cinder; do
     helm delete --purge $x-create-keystone-service
@@ -325,6 +330,11 @@ for x in glance neutron cinder; do
     helm delete --purge $x-create-keystone-endpoint-admin
 done
 
+helm delete --purge cinder-create-keystone-servicev2
+helm delete --purge cinder-create-keystone-endpoint-publicv2
+helm delete --purge cinder-create-keystone-endpoint-internalv2
+helm delete --purge cinder-create-keystone-endpoint-adminv2
+
 helm install kolla/cinder-volume-ceph --version 3.0.0-1 \
     --set "$common_vars,element_name=cinder" --namespace kolla \
     --name cinder-volume-ceph

tools/helm_prebuild_microservices.py

@@ -54,9 +54,13 @@ common_create_keystone_admin = [
     'nova-create-keystone-endpoint-internal',
     'nova-create-keystone-endpoint-admin',
     'cinder-create-keystone-service',
+    'cinder-create-keystone-servicev2',
     'cinder-create-keystone-endpoint-public',
     'cinder-create-keystone-endpoint-internal',
-    'cinder-create-keystone-endpoint-admin'
+    'cinder-create-keystone-endpoint-admin',
+    'cinder-create-keystone-endpoint-publicv2',
+    'cinder-create-keystone-endpoint-internalv2',
+    'cinder-create-keystone-endpoint-adminv2'
 ]