Adding nova placement api to kolla kubernetes

Adding nova placement api to kolla kubernetes Change-Id: I325e0f45ea285dd97adf1cc4e65d92af4ba57830 Partially-Implements: blueprint kolla-kubernetes-placement
openstack-archive · Mar 11, 2017 · b89e113 · b89e113
1 parent 2cdd48e
commit b89e113
Show file tree

Hide file tree

Showing 34 changed files with 494 additions and 3 deletions.
diff --git a/etc/kolla-kubernetes/service_resources.yml b/etc/kolla-kubernetes/service_resources.yml
@@ -414,6 +414,12 @@ kolla-kubernetes:
         vars:
           configmap_name: nova-novncproxy-logging
           log_format: 'openstack'
+      - name: placement-api
+      - name: placement-api-haproxy
+        template: services/common/api-haproxy-configmap.yml.j2
+        vars:
+          configmap_name: placement-api-haproxy
+          port_name: placement_api_port
       secret:
       - name: nova-libvirt
         template: services/nova/nova-libvirt-secret.yml.j2

diff --git a/helm/all_values.yaml b/helm/all_values.yaml
@@ -379,6 +379,16 @@ nova-api-svc:
                             port_external: true
                             node_port_enabled: false
 
+nova-placement-svc:
+        global:
+            kolla:
+                nova:
+                    placement_api:
+                        all:
+                            port: 8780
+                            node_port: 8780
+                            port_external: true
+                            node_port_enabled: false
 nova-metadata-svc:
         global:
             kolla:
@@ -446,6 +456,14 @@ nova-api-deployment:
                         all:
                             port: 8775
 
+nova-placement-deployment:
+        global:
+            kolla:
+                nova:
+                    placement_api:
+                        all:
+                            port: 8780
+
 nova-novncproxy-deployment:
         global:
             kolla:
@@ -505,6 +523,32 @@ nova-delete-keystone-user-job:
                     all:
                         keystone_user_name: nova
 
+nova-placement-create-keystone-user-job:
+        global:
+            kolla:
+                all:
+                    keystone_user_project: service
+                    keystone_user_project_domain: Default
+                    keystone_user_domain: Default
+                    keystone_user_role: admin
+                nova:
+                    placement_api:
+                        all:
+                            keystone_user_name: placement
+
+nova-placement-delete-keystone-user-job:
+        global:
+            kolla:
+                all:
+                    keystone_user_project: service
+                    keystone_user_project_domain: Default
+                    keystone_user_domain: Default
+                    keystone_user_role: admin
+                nova:
+                    placement_api:
+                        all:
+                            keystone_user_name: placement
+
 nova-create-keystone-endpoint-admin-job:
         global:
             kolla:
@@ -537,6 +581,38 @@ nova-create-keystone-endpoint-public-job:
                         all:
                             port: 8774
 
+nova-placement-create-keystone-endpoint-admin-job:
+        global:
+            kolla:
+                nova:
+                    placement_api:
+                        all:
+                            port: 8780
+                        create_keystone_endpoint:
+                            all:
+                                service: placement-api
+
+nova-placement-create-keystone-endpoint-internal-job:
+        global:
+            kolla:
+                nova:
+                    placement_api:
+                        all:
+                            port: 8780
+                        create_keystone_endpoint:
+                            all:
+                                service: placement-api
+
+nova-placement-create-keystone-endpoint-public-job:
+        global:
+            kolla:
+                all:
+                    external_vip:
+                nova:
+                    placement_api:
+                        all:
+                            port: 8780
+
 heat-api-svc:
         global:
             kolla:
@@ -1044,7 +1120,7 @@ ironic-inspector-deployment:
                 ironic:
                     inspector:
                         all:
-                            port: 5050 
+                            port: 5050
                             ironic_interface: net2
 
 ironic-dnsmasq-daemonset:

diff --git a/helm/microservice/nova-placement-create-keystone-endpoint-admin-job/Chart.yaml b/helm/microservice/nova-placement-create-keystone-endpoint-admin-job/Chart.yaml
@@ -0,0 +1,12 @@
+name: nova-placement-create-keystone-endpoint-admin-job
+version: 0.6.0-1
+description: Helm chart for creating placement-api keystone admin endpoint
+keywords:
+  - openstack
+  - nova
+  - placement-api
+  - keystone-endpoint-admin
+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
diff --git a/helm/microservice/nova-placement-create-keystone-endpoint-admin-job/requirements.yaml b/helm/microservice/nova-placement-create-keystone-endpoint-admin-job/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1
diff --git a/...-keystone-endpoint-admin-job/templates/nova-placement-create-keystone-endpoint-admin.yaml b/...-keystone-endpoint-admin-job/templates/nova-placement-create-keystone-endpoint-admin.yaml
@@ -0,0 +1,15 @@
+{{- $searchPath := ":global.kolla.nova.placement_api.create_keystone_endpoint.admin.job:global.kolla.nova.placement_api.create_keystone_endpoint.all:global.kolla.nova.placement_api.all:global.kolla.nova.all:global.kolla.all" }}
+{{- $resourceName := "placement-api-create-keystone-endpoint-admin" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "placement-api" }}
+{{- $serviceType := "placement" }}
+{{- $interface := "admin" }}
+{{- $service := include "kolla_val_get_str" (dict "key" "service" "searchPath" $searchPath "Values" .Values) }}
+{{- $port := include "kolla_val_get_str" (dict "key" "port" "searchPath" $searchPath "Values" .Values) }}
+{{- $placementapiAdminEndpointBuilt := printf "http://%s:%s" $service $port }}
+{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
+{{- $endpointURLFull := $endpointURLFullUser | default $placementapiAdminEndpointBuilt }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "Release" .Release "Values" .Values "searchPath" $searchPath }}
+{{- include "common_create_keystone_endpoint" $env }}
+{{- end }}
diff --git a/helm/microservice/nova-placement-create-keystone-endpoint-internal-job/Chart.yaml b/helm/microservice/nova-placement-create-keystone-endpoint-internal-job/Chart.yaml
@@ -0,0 +1,12 @@
+name: nova-placement-create-keystone-endpoint-internal-job
+version: 0.6.0-1
+description: Helm chart for the placement-api internal keystone endpoint
+keywords:
+  - openstack
+  - nova
+  - placement-api
+  - keystone-endpoint-internal
+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
diff --git a/helm/microservice/nova-placement-create-keystone-endpoint-internal-job/requirements.yaml b/helm/microservice/nova-placement-create-keystone-endpoint-internal-job/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1
diff --git a/...one-endpoint-internal-job/templates/nova-placement-create-keystone-endpoint-internal.yaml b/...one-endpoint-internal-job/templates/nova-placement-create-keystone-endpoint-internal.yaml
@@ -0,0 +1,15 @@
+{{- $searchPath := ":global.kolla.nova.placement_api.create_keystone_endpoint.internal.job:global.kolla.nova.placement_api.create_keystone_endpoint.all:global.kolla.nova.placement_api.all:global.kolla.nova.all:global.kolla.all" }}
+{{- $resourceName := "placement-api-create-keystone-endpoint-internal" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "placement-api" }}
+{{- $serviceType := "placement" }}
+{{- $interface := "internal" }}
+{{- $service := include "kolla_val_get_str" (dict "key" "service" "searchPath" $searchPath "Values" .Values) }}
+{{- $port := include "kolla_val_get_str" (dict "key" "port" "searchPath" $searchPath "Values" .Values) }}
+{{- $placementapiInternalEndpointBuilt := printf "http://%s:%s" $service $port }}
+{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
+{{- $endpointURLFull := $endpointURLFullUser | default $placementapiInternalEndpointBuilt }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "Release" .Release "Values" .Values "searchPath" $searchPath }}
+{{- include "common_create_keystone_endpoint" $env }}
+{{- end }}
diff --git a/helm/microservice/nova-placement-create-keystone-endpoint-public-job/Chart.yaml b/helm/microservice/nova-placement-create-keystone-endpoint-public-job/Chart.yaml
@@ -0,0 +1,12 @@
+name: nova-placement-create-keystone-endpoint-public-job
+version: 0.6.0-1
+description: Helm chart for creating placement-api public keystone endpoint
+keywords:
+  - openstack
+  - nova
+  - placement-api
+  - keystone-endpoint-admin
+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
diff --git a/helm/microservice/nova-placement-create-keystone-endpoint-public-job/requirements.yaml b/helm/microservice/nova-placement-create-keystone-endpoint-public-job/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1
diff --git a/...eystone-endpoint-public-job/templates/nova-placement-create-keystone-endpoint-public.yaml b/...eystone-endpoint-public-job/templates/nova-placement-create-keystone-endpoint-public.yaml
@@ -0,0 +1,15 @@
+{{- $searchPath := ":global.kolla.nova.placement_api.create_keystone_endpoint.public.job:global.kolla.nova.placement_api.create_keystone_endpoint.all:global.kolla.nova.placement_api.all:global.kolla.nova.all:global.kolla.all" }}
+{{- $resourceName := "placement-api-create-keystone-endpoint-public" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "placement-api" }}
+{{- $serviceType := "placement" }}
+{{- $interface := "public" }}
+{{- $port := include "kolla_val_get_str" (dict "key" "port" "searchPath" $searchPath "Values" .Values) }}
+{{- $externalVip := include "kolla_val_get_str" (dict "key" "external_vip" "searchPath" $searchPath "Values" .Values) }}
+{{- $placementapiPublicEndpointBuilt := printf "http://%s:%s" $externalVip $port }}
+{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
+{{- $endpointURLFull := $endpointURLFullUser | default $placementapiPublicEndpointBuilt }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "Release" .Release "Values" .Values "searchPath" $searchPath }}
+{{- include "common_create_keystone_endpoint" $env }}
+{{- end }}
diff --git a/helm/microservice/nova-placement-create-keystone-service-job/Chart.yaml b/helm/microservice/nova-placement-create-keystone-service-job/Chart.yaml
@@ -0,0 +1,12 @@
+name: nova-placement-create-keystone-service-job
+version: 0.6.0-1
+description: Helm chart for the placement-api keystone service
+keywords:
+  - openstack
+  - nova
+  - placement-api
+  - keystone-service
+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
diff --git a/helm/microservice/nova-placement-create-keystone-service-job/requirements.yaml b/helm/microservice/nova-placement-create-keystone-service-job/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1
diff --git a/...acement-create-keystone-service-job/templates/nova-placement-create-keystone-service.yaml b/...acement-create-keystone-service-job/templates/nova-placement-create-keystone-service.yaml
@@ -0,0 +1,10 @@
+{{- $searchPath := ":global.kolla.nova.placement_api.create_keystone_service.job:global.kolla.nova.placement_api.create_keystone_service.all:global.kolla.nova.placement_api.all:global.kolla.nova.all:global.kolla.all" }}
+{{- $resourceName := "placement-api-create-keystone-service" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "placement" }}
+{{- $serviceType := "placement" }}
+{{- $description := "Placement Service" }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "description" $description "Values" .Values "Release" .Release "searchPath" $searchPath }}
+{{- include "common_create_keystone_service" $env }}
+{{- end }}
diff --git a/helm/microservice/nova-placement-create-keystone-user-job/Chart.yaml b/helm/microservice/nova-placement-create-keystone-user-job/Chart.yaml
@@ -0,0 +1,13 @@
+name: nova-placement-create-keystone-user-job
+version: 0.6.0-1
+description: nova placement-api create keystone user
+keywords:
+  - openstack
+  - nova
+  - placement-api
+  - user
+  - create
+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
diff --git a/helm/microservice/nova-placement-create-keystone-user-job/requirements.yaml b/helm/microservice/nova-placement-create-keystone-user-job/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1
diff --git a/...ova-placement-create-keystone-user-job/templates/nova-placement-create-keystone-user.yaml b/...ova-placement-create-keystone-user-job/templates/nova-placement-create-keystone-user.yaml
@@ -0,0 +1,20 @@
+{{- $searchPath := ":global.kolla.nova.placement_api.create_keystone_user.job:global.kolla.nova.placement_api.create_keystone_user.all:global.kolla.nova.placement_api.all:global.nova.kolla.all:global.kolla.all" }}
+{{- $resourceName := "placement-api-create-keystone-user" }}
+{{- $serviceName := "placement" }}
+{{- $serviceType := "create-keystone-user" }}
+{{- $elementName := .Values.element_name | default $serviceName }}
+{{- $elementType := .Values.element_type | $serviceType }}
+
+{{- $userName := include "kolla_val_get_str" (dict "key" "keystone_user_name" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userDomain := include "kolla_val_get_str" (dict "key" "keystone_user_domain" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userProject := include "kolla_val_get_str" (dict "key" "keystone_user_project" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userProjectDomain := include "kolla_val_get_str" (dict "key" "keystone_user_project_domain" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userRole := include "kolla_val_get_str" (dict "key" "keystone_user_role" "searchPath" $searchPath "Values" .Values ) }}
+
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+
+{{- with $env := dict "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "elementName" $elementName "elementType" $elementType "podTypeBootstrap" $podTypeBootstrap "userName" $userName "userDomain" $userDomain "userProject" $userProject "userProjectDomain" $userProjectDomain "userRole" $userRole "Values" .Values "Release" .Release "searchPath" $searchPath }}
+
+{{- include "common_create_keystone_user" $env }}
+{{- end }}
diff --git a/helm/microservice/nova-placement-delete-keystone-service-job/Chart.yaml b/helm/microservice/nova-placement-delete-keystone-service-job/Chart.yaml
@@ -0,0 +1,13 @@
+name: nova-placement-delete-keystone-service-job
+version: 0.6.0-1
+description: Helm chart to delete the placement-api keystone service
+keywords:
+  - openstack
+  - nova
+  - placement-api
+  - delete
+  - service
+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
diff --git a/helm/microservice/nova-placement-delete-keystone-service-job/requirements.yaml b/helm/microservice/nova-placement-delete-keystone-service-job/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1
diff --git a/...acement-delete-keystone-service-job/templates/nova-placement-delete-keystone-service.yaml b/...acement-delete-keystone-service-job/templates/nova-placement-delete-keystone-service.yaml
@@ -0,0 +1,10 @@
+{{- $searchPath := ":global.kolla.nova.placement_api.delete_keystone_service.job:global.kolla.nova.placement_api.delete_keystone_service.all:global.kolla.nova.placement_api.all:global.nova.kolla.all:global.kolla.all" }}
+{{- $resourceName := "placement-api-delete-keystone-service" }}
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+{{- $serviceName := "placement-api" }}
+{{- $serviceType := "placement" }}
+{{- $description := "Placement Service" }}
+{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "description" $description "Values" .Values "Release" .Release "searchPath" $searchPath }}
+{{- include "common_delete_keystone_service" $env }}
+{{- end }}
diff --git a/helm/microservice/nova-placement-delete-keystone-user-job/Chart.yaml b/helm/microservice/nova-placement-delete-keystone-user-job/Chart.yaml
@@ -0,0 +1,13 @@
+name: nova-placement-delete-keystone-user-job
+version: 0.6.0-1
+description: Helm chart to delete the placement-api keystone user
+keywords:
+  - openstack
+  - nova
+  - placement-api
+  - delete
+  - user
+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
diff --git a/helm/microservice/nova-placement-delete-keystone-user-job/requirements.yaml b/helm/microservice/nova-placement-delete-keystone-user-job/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1
diff --git a/...ova-placement-delete-keystone-user-job/templates/nova-placement-delete-keystone-user.yaml b/...ova-placement-delete-keystone-user-job/templates/nova-placement-delete-keystone-user.yaml
@@ -0,0 +1,20 @@
+{{- $searchPath := ":global.kolla.nova.placement_api.delete_keystone_user.job:global.kolla.nova.placement_api.delete_keystone_user.all:global.kolla.nova.placement_api.all:global.kolla.nova.all:global.kolla.all" }}
+{{- $resourceName := "placement-api-delete-keystone-user" }}
+{{- $serviceName := "placement-api" }}
+{{- $serviceType := "delete-keystone-user" }}
+{{- $elementName := .Values.element_name | default $serviceName }}
+{{- $elementType := .Values.element_type | $serviceType }}
+
+{{- $userName := include "kolla_val_get_str" (dict "key" "keystone_user_name" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userDomain := include "kolla_val_get_str" (dict "key" "keystone_user_domain" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userProject := include "kolla_val_get_str" (dict "key" "keystone_user_project" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userProjectDomain := include "kolla_val_get_str" (dict "key" "keystone_user_project_domain" "searchPath" $searchPath "Values" .Values ) }}
+{{- $userRole := include "kolla_val_get_str" (dict "key" "keystone_user_role" "searchPath" $searchPath "Values" .Values ) }}
+
+{{- $netHostTrue := false }}
+{{- $podTypeBootstrap := true }}
+
+{{- with $env := dict "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "elementName" $elementName "elementType" $elementType "podTypeBootstrap" $podTypeBootstrap "userName" $userName "userDomain" $userDomain "userProject" $userProject "userProjectDomain" $userProjectDomain "userRole" $userRole "Values" .Values "Release" .Release "searchPath" $searchPath }}
+
+{{- include "common_delete_keystone_user" $env }}
+{{- end }}
diff --git a/helm/microservice/nova-placement-deployment/Chart.yaml b/helm/microservice/nova-placement-deployment/Chart.yaml
@@ -0,0 +1,11 @@
+name: nova-placement-deployment
+version: 0.6.0-1
+description: nova placement-api deployment chart
+keywords:
+  - openstack
+  - nova
+  - placement-api
+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
diff --git a/helm/microservice/nova-placement-deployment/requirements.yaml b/helm/microservice/nova-placement-deployment/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: kolla-common
+    repository: file://../../kolla-common
+    version: 0.6.0-1