Keystone service deployment with kubernetes entrypoint

This PS adds keystone service entrypoint deployment

Change-Id: Ifc671170d73d1f679f95bdf78f7f32b644a75bad
Partially-Implements: blueprint helm-services

helm/all_values.yaml

@@ -80,7 +80,7 @@ keystone-public-svc:
                     all:
                         port: 5000
                         node_port: 5000
-                        port_external: false
+                        port_external: true
                         node_port_enabled: false
 
 keystone-create-db-job:

helm/microservice/keystone-create-endpoints-job/templates/keystone_create_endpoints.yaml

@@ -1,4 +1,4 @@
-{{- $searchPath := ":global.kolla.keystone.create_keystone_endpoint.job:global.kolla.keystone.create_keystone_endpoint.all:global.kolla.keystone.all:global.kolla.all" }}
+{{- $searchPath := ":global.kolla.keystone.create_keystone_endpoints.job:global.kolla.keystone.create_keystone_endpoints.all:global.kolla.keystone.all:global.kolla.all" }}
 {{- $containerConfigDirectory := include "kolla_val_get_str" (dict "key" "container_config_directory" "searchPath" $searchPath "Values" .Values ) }}
 {{- $selectorKey := include "kolla_val_get_str" (dict "key" "selector_key" "searchPath" $searchPath "Values" .Values ) }}
 {{- $selectorValue := include "kolla_val_get_str" (dict "key" "selector_value" "searchPath" $searchPath "Values" .Values ) }}
@@ -20,7 +20,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keystone-endpoints
+  name: keystone-create-endpoints
 spec:
   template:
 {{- include "init_container_header" $env | indent 4 }}

helm/service/keystone/Chart.yaml

@@ -0,0 +1,10 @@
+name: keystone
+version: 0.4.0-1
+description: Helm chart for keystone
+keywords:
+  - openstack
+  - keystone
+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/service/keystone/requirements.yaml

@@ -0,0 +1,22 @@
+dependencies:
+  - name: keystone-admin-svc
+    repository: http://localhost:10191
+    version: 0.4.0-1
+  - name: keystone-internal-svc
+    repository: http://localhost:10191
+    version: 0.4.0-1
+  - name: keystone-public-svc
+    repository: http://localhost:10191
+    version: 0.4.0-1
+  - name: keystone-create-db-job
+    repository: http://localhost:10191
+    version: 0.4.0-1
+  - name: keystone-manage-db-job
+    repository: http://localhost:10191
+    version: 0.4.0-1
+  - name: keystone-create-endpoints-job
+    repository: http://localhost:10191
+    version: 0.4.0-1
+  - name: keystone-api-deployment
+    repository: http://localhost:10191
+    version: 0.4.0-1

helm/service/keystone/values.yaml

@@ -0,0 +1,44 @@
+global:
+    kolla:
+        all:
+            kubernetes_entrypoint: true
+        keystone:
+            create_db:
+                job:
+                    kubernetes_entrypoint: true
+                    dependencies:
+                        service:
+                        - mariadb
+            manage_db:
+                job:
+                    kubernetes_entrypoint: true
+                    dependencies:
+                        service:
+                        - mariadb
+                        jobs:
+                        - keystone-create-db
+            create_keystone_endpoints:
+                job:
+                    kubernetes_entrypoint: true
+                    dependencies:
+                        jobs:
+                        - keystone-create-db
+                        - keystone-manage-db
+                        service:
+                        - mariadb
+                        - keystone-admin
+                        - keystone-public
+                        - keystone-internal
+            api:
+                deployment:
+                    kubernetes_entrypoint: true
+                    dependencies:
+                        jobs:
+                        - keystone-create-endpoints
+                        - keystone-create-db
+                        - keystone-manage-db
+                        service:
+                        - mariadb
+                        - keystone-admin
+                        - keystone-public
+                        - keystone-internal

releasenotes/notes/keystone_service-1e9717d09e63de03.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    keystone service package for deployment with kubernetes entrypoint.

tests/bin/ceph_workflow_service.sh

@@ -85,18 +85,6 @@ helm install kolla/memcached-svc --version $VERSION \
 helm install kolla/rabbitmq-svc --version $VERSION \
     --namespace kolla --name rabbitmq-svc --set element_name=rabbitmq
 
-helm install kolla/keystone-admin-svc --version $VERSION \
-    --namespace kolla --name keystone-admin-svc \
-    --set "element_name=keystone-admin"
-
-helm install kolla/keystone-public-svc --version $VERSION \
-    --namespace kolla --name keystone-public-svc \
-    --set "element_name=keystone-public,port_external=true,external_vip=$IP"
-
-helm install kolla/keystone-internal-svc --version $VERSION \
-    --namespace kolla --name keystone-internal-svc \
-    --set "element_name=keystone-internal"
-
 helm install kolla/neutron-server-svc --version $VERSION \
     --namespace kolla --name neutron-server-svc \
     --set "port_external=true,external_vip=$IP"
@@ -140,41 +128,9 @@ helm install kolla/rabbitmq-statefulset --version $VERSION \
 $DIR/tools/pull_containers.sh kolla
 $DIR/tools/wait_for_pods.sh kolla
 
-helm install --debug kolla/keystone-create-db-job --version $VERSION \
-    --set element_name=keystone \
-    --namespace kolla \
-    --name keystone-create-db \
-    --set "$common_vars"
-
-$DIR/tools/pull_containers.sh kolla
-$DIR/tools/wait_for_pods.sh kolla
-
-helm delete keystone-create-db
-
-helm install --debug kolla/keystone-manage-db-job --version $VERSION \
-    --namespace kolla \
-    --name keystone-manage-db \
-    --set "$common_vars"
-
-$DIR/tools/pull_containers.sh kolla
-$DIR/tools/wait_for_pods.sh kolla
-
-helm delete keystone-manage-db --purge
-
-kollakube template bootstrap keystone-endpoints
-
-helm install --debug kolla/keystone-create-endpoints-job --version $VERSION \
-    --namespace kolla \
-    --set $common_vars,element_name=keystone,public_host=$IP \
-    --name keystone-create-endpoints-job
-
-$DIR/tools/pull_containers.sh kolla
-$DIR/tools/wait_for_pods.sh kolla
-
-helm install --debug kolla/keystone-api-deployment --version $VERSION \
-    --set "$common_vars" \
-    --namespace kolla \
-    --name keystone
+helm install kolla/keystone --debug  --version $VERSION \
+    --namespace kolla --name keystone --set "$common_vars,element_name=keystone" \
+    --values <(helm_entrypoint_general $1)
 
 $DIR/tools/wait_for_pods.sh kolla