Helm charts for heat/heat-cfn microservices
Add heat-create-keystone-endpoint-admin
heat-create-keystone-endpoint-internal
heat-create-keystone-endpoint-public
heat-create-keystone-service
heat-cfn-create-keystone-endpoint-admin
heat-cfn-create-keystone-endpoint-internal
heat-cfn-create-keystone-endpoint-public
heat-cfn-create-keystone-service
heat-create-keystone-user
heat-create-db-job
heat-manage-db-job
heat-delete-db-job
Co-Authored-By: Duong Ha-Quang <duonghq@vn.fujitsu.com>
Co-Authored-By: Balaji Pattewar <balaji.pattewar@oracle.com>
Co-Authored-By: dupengfei <58750307@qq.com>
Partially-Implements: blueprint more-microservices
Change-Id: I9593fd15255d0fe09739662d01c960d6143a1cf4
This commit is contained in:
dupengfei
Balaji Pattewar
parent
8314050408
commit
c6e743c95a
|
|
@ -1131,3 +1131,49 @@ kolla-kubernetes:
|
|||
vars:
|
||||
configmap_name: ironic-inspector-haproxy
|
||||
port_name: ironic_inspector_port
|
||||
- name: heat
|
||||
pods:
|
||||
- name: heat-all
|
||||
containers:
|
||||
- name: heat-all
|
||||
- name: heat-api
|
||||
containers:
|
||||
- name: heat-api
|
||||
- name: heat-api-cfn
|
||||
containers:
|
||||
- name: heat-api-cfn
|
||||
- name: heat-engine
|
||||
containers:
|
||||
- name: heat-engine
|
||||
resources:
|
||||
configmap:
|
||||
- name: heat
|
||||
- name: heat-all
|
||||
- name: heat-api
|
||||
- name: heat-api-haproxy
|
||||
template: services/common/api-haproxy-configmap.yml.j2
|
||||
vars:
|
||||
configmap_name: heat-api-haproxy
|
||||
port_name: heat_api_port
|
||||
- name: heat-api-logging
|
||||
template: services/common/logging-configmap.yml.j2
|
||||
vars:
|
||||
configmap_name: heat-api-logging
|
||||
log_format: 'openstack'
|
||||
- name: heat-api-cfn
|
||||
- name: heat-api-cfn-haproxy
|
||||
template: services/common/api-haproxy-configmap.yml.j2
|
||||
vars:
|
||||
configmap_name: heat-api-cfn-haproxy
|
||||
port_name: heat_api_cfn_port
|
||||
- name: heat-api-cfn-logging
|
||||
template: services/common/logging-configmap.yml.j2
|
||||
vars:
|
||||
configmap_name: heat-api-cfn-logging
|
||||
log_format: 'openstack'
|
||||
- name: heat-engine
|
||||
- name: heat-engine-logging
|
||||
template: services/common/logging-configmap.yml.j2
|
||||
vars:
|
||||
configmap_name: heat-engine-logging
|
||||
log_format: 'openstack'
|
||||
|
|
|
|||
|
|
@ -575,6 +575,110 @@ heat-api-cfn-deployment:
|
|||
all:
|
||||
port: 8000
|
||||
|
||||
heat-delete-db-job:
|
||||
global:
|
||||
kolla:
|
||||
heat:
|
||||
all:
|
||||
database_name: "heat"
|
||||
database_user: "heat"
|
||||
|
||||
heat-create-keystone-user-job:
|
||||
global:
|
||||
kolla:
|
||||
all:
|
||||
keystone_user_project: service
|
||||
keystone_user_project_domain: Default
|
||||
keystone_user_domain: Default
|
||||
keystone_user_role: admin
|
||||
heat:
|
||||
all:
|
||||
keystone_user_name: heat
|
||||
|
||||
heat-delete-keystone-user-job:
|
||||
global:
|
||||
kolla:
|
||||
all:
|
||||
keystone_user_project: service
|
||||
keystone_user_project_domain: Default
|
||||
keystone_user_domain: Default
|
||||
keystone_user_role: admin
|
||||
heat:
|
||||
all:
|
||||
keystone_user_name: heat
|
||||
|
||||
heat-create-keystone-endpoint-admin-job:
|
||||
global:
|
||||
kolla:
|
||||
heat:
|
||||
api:
|
||||
all:
|
||||
port: 8004
|
||||
create_keystone_endpoint:
|
||||
all:
|
||||
service: heat-api
|
||||
|
||||
heat-create-keystone-endpoint-internal-job:
|
||||
global:
|
||||
kolla:
|
||||
heat:
|
||||
api:
|
||||
all:
|
||||
port: 8004
|
||||
create_keystone_endpoint:
|
||||
all:
|
||||
service: heat-api
|
||||
|
||||
heat-create-keystone-endpoint-public-job:
|
||||
global:
|
||||
kolla:
|
||||
all:
|
||||
external_vip:
|
||||
heat:
|
||||
api:
|
||||
all:
|
||||
port: 8004
|
||||
|
||||
heat-cfn-create-keystone-endpoint-admin-job:
|
||||
global:
|
||||
kolla:
|
||||
heat:
|
||||
api_cfn:
|
||||
all:
|
||||
port: 8000
|
||||
create_keystone_endpoint:
|
||||
all:
|
||||
service: heat-api
|
||||
|
||||
heat-cfn-create-keystone-endpoint-internal-job:
|
||||
global:
|
||||
kolla:
|
||||
heat:
|
||||
api_cfn:
|
||||
all:
|
||||
port: 8000
|
||||
create_keystone_endpoint:
|
||||
all:
|
||||
service: heat-api
|
||||
|
||||
heat-cfn-create-keystone-endpoint-public-job:
|
||||
global:
|
||||
kolla:
|
||||
all:
|
||||
external_vip:
|
||||
heat:
|
||||
api_cfn:
|
||||
all:
|
||||
port: 8000
|
||||
|
||||
heat-create-db-job:
|
||||
global:
|
||||
kolla:
|
||||
heat:
|
||||
all:
|
||||
database_name: "heat"
|
||||
database_user: "heat"
|
||||
|
||||
glance-api-svc:
|
||||
global:
|
||||
kolla:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-cfn-create-keystone-endpoint-admin-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart for creating heat cfn keystone admin endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- heat-cfn
|
||||
- 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
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_endpoint.admin.job:global.kolla.heat.create_keystone_endpoint.all:global.kolla.heat.api_cfn.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-cfn-create-keystone-endpoint-admin" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat-cfn" }}
|
||||
{{- $serviceType := "cloudformation" }}
|
||||
{{- $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) }}
|
||||
{{- $heatCfnAdminEndpointBuilt := printf "http://%s:%s/v1" $service $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $heatCfnAdminEndpointBuilt }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-cfn-create-keystone-endpoint-internal-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart for the heat cfn internal keystone endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- heat-cfn
|
||||
- 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
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_endpoint.admin.job:global.kolla.heat.create_keystone_endpoint.all:global.kolla.heat.api_cfn.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-cfn-create-keystone-endpoint-internal" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat-cfn" }}
|
||||
{{- $serviceType := "cloudformation" }}
|
||||
{{- $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) }}
|
||||
{{- $heatCfnInternalEndpointBuilt := printf "http://%s:%s/v1" $service $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $heatCfnInternalEndpointBuilt }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-cfn-create-keystone-endpoint-public-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart for creating heat cfn public keystone endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- heat-cfn
|
||||
- keystone-endpoint-public
|
||||
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
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_endpoint.admin.job:global.kolla.heat.create_keystone_endpoint.all:global.kolla.heat.api_cfn.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-cfn-create-keystone-endpoint-public" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat-cfn" }}
|
||||
{{- $serviceType := "cloudformation" }}
|
||||
{{- $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) }}
|
||||
{{- $heatCfnPublicEndpointBuilt := printf "http://%s:%s/v1" $externalVip $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $heatCfnPublicEndpointBuilt }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-cfn-create-keystone-service-job
|
||||
version: 0.6.0-1 #FIXME make this changable
|
||||
description: Helm chart for the heat cfn keystone service
|
||||
keywords:
|
||||
- openstack
|
||||
- heat-cfn
|
||||
- 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
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_service.job:global.kolla.heat.create_keystone_service.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-cfn-create-keystone-service" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat-cfn" }}
|
||||
{{- $serviceType := "cloudformation" }}
|
||||
{{- $description := "Openstack Orchestration" }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: heat-cfn-delete-keystone-service-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart to delete the heat-cfn keystone service
|
||||
keywords:
|
||||
- openstack
|
||||
- heat-cfn
|
||||
- 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
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{{- $searchPath := ":global.kolla.heat.delete_keystone_service.job:global.kolla.heat.delete_keystone_service.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-cfn-delete-keystone-service" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat-cfn" }}
|
||||
{{- $serviceType := "cloudformation" }}
|
||||
{{- $description := "Openstack Orchestration" }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: heat-create-db-job
|
||||
version: 0.6.0-1
|
||||
description: Heat job for create database
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- db
|
||||
- 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
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_db.job:global.kolla.heat.create_db.all:global.kolla.heat.api.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat" }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- with $env := dict "resourceName" $resourceName "serviceName" $serviceName "podTypeBootstrap" $podTypeBootstrap "Values" .Values "Release" .Release "searchPath" $searchPath }}
|
||||
{{- include "common_create_db_job" $env }}
|
||||
{{- end }}
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-create-keystone-endpoint-admin-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart for creating heat keystone admin endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- 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
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_endpoint.admin.job:global.kolla.heat.create_keystone_endpoint.all:global.kolla.heat.api.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-create-keystone-endpoint-admin" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $serviceType := "orchestration" }}
|
||||
{{- $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) }}
|
||||
{{- $heatAdminEndpointBuilt := printf "http://%s:%s/v1/%%(tenant_id)s" $service $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $heatAdminEndpointBuilt }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-create-keystone-endpoint-internal-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart for the heat internal keystone endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- 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
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_endpoint.admin.job:global.kolla.heat.create_keystone_endpoint.all:global.kolla.heat.api.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-create-keystone-endpoint-internal" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $serviceType := "orchestration" }}
|
||||
{{- $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) }}
|
||||
{{- $heatInternalEndpointBuilt := printf "http://%s:%s/v1/%%(tenant_id)s" $service $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $heatInternalEndpointBuilt }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-create-keystone-endpoint-public-job
|
||||
version: 0.6.0-1 #FIXME make this changable
|
||||
description: Helm chart for creating heat public keystone endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- keystone-endpoint-public
|
||||
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
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_endpoint.admin.job:global.kolla.heat.create_keystone_endpoint.all:global.kolla.heat.api.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-create-keystone-endpoint-public" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $serviceType := "orchestration" }}
|
||||
{{- $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) }}
|
||||
{{- $heatPublicEndpointBuilt := printf "http://%s:%s/v1/%%(tenant_id)s" $externalVip $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $heatPublicEndpointBuilt }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
name: heat-create-keystone-service-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart for the heat keystone service
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- 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
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_service.job:global.kolla.heat.create_keystone_service.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-create-keystone-service" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $serviceType := "orchestration" }}
|
||||
{{- $description := "Openstack Orchestration" }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: heat-create-keystone-user-job
|
||||
version: 0.6.0-1
|
||||
description: FIXME
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- 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
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
{{- $searchPath := ":global.kolla.heat.create_keystone_user.job:global.kolla.heat.create_keystone_user.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-create-keystone-user" }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $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 }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: heat-delete-db-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart to delete the heat database
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- delete
|
||||
- database
|
||||
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
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{{- $searchPath := ":global.kolla.heat.delete_db.job:global.kolla.heat.delete_db.all:global.kolla.heat.api.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat" }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- with $env := dict "resourceName" $resourceName "serviceName" $serviceName "podTypeBootstrap" $podTypeBootstrap "Values" .Values "Release" .Release "searchPath" $searchPath }}
|
||||
{{- include "common_delete_db_job" $env }}
|
||||
{{- end }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: heat-delete-keystone-service-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart to delete the heat keystone service
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- 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
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{{- $searchPath := ":global.kolla.heat.delete_keystone_service.job:global.kolla.heat.delete_keystone_service.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-delete-keystone-service" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $serviceType := "orchestration" }}
|
||||
{{- $description := "Openstack orchestration" }}
|
||||
{{- 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 }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: heat-delete-keystone-user-job
|
||||
version: 0.6.0-1
|
||||
description: Helm chart to delete the heat keystone user
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- 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
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
{{- $searchPath := ":global.kolla.heat.delete_keystone_user.job:global.kolla.heat.delete_keystone_user.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $resourceName := "heat-delete-keystone-user" }}
|
||||
{{- $serviceName := "heat" }}
|
||||
{{- $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 }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: heat-manage-db-job
|
||||
version: 0.6.0-1
|
||||
description: Heat job for database management
|
||||
keywords:
|
||||
- openstack
|
||||
- heat
|
||||
- db
|
||||
- manage
|
||||
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
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{{- $searchPath := ":global.kolla.heat.manage_db.job:global.kolla.heat.manage_db.all:global.kolla.heat.all:global.kolla.all" }}
|
||||
{{- $c := dict "searchPath" $searchPath "Values" .Values }}
|
||||
{{- $_ := set $c "contName" "heat-engine" }}
|
||||
{{- $_ := set $c "imageName" "image_full" }}
|
||||
{{- $_ := set $c "tagName" "image_tag" }}
|
||||
{{- $imageFull := include "kolla_build_image_full" $c }}
|
||||
{{- $resourceName := "heat" }}
|
||||
{{- $serviceName := "heat-engine" }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- with $env := dict "resourceName" $resourceName "serviceName" $serviceName "podTypeBootstrap" $podTypeBootstrap "imageFull" $imageFull "Values" .Values "Release" .Release "searchPath" $searchPath }}
|
||||
{{- include "common_manage_db_job" $env }}
|
||||
{{- end }}
|
||||
|
|
@ -255,9 +255,27 @@ helm install kolla/neutron-create-keystone-endpoint-admin-job --version $VERSION
|
|||
--namespace kolla --name neutron-create-keystone-endpoint-admin \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/heat-create-keystone-user-job --version $VERSION \
|
||||
--namespace kolla --name heat-create-keystone-user
|
||||
|
||||
for x in heat heat-cfn; do
|
||||
helm install kolla/$x-create-keystone-service-job --version $VERSION \
|
||||
--namespace kolla --name $x-create-keystone-service \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
helm install kolla/$x-create-keystone-endpoint-public-job --version $VERSION \
|
||||
--namespace kolla --name $x-create-keystone-endpoint-public \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
helm install kolla/$x-create-keystone-endpoint-internal-job --version $VERSION \
|
||||
--namespace kolla --name $x-create-keystone-endpoint-internal \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
helm install kolla/$x-create-keystone-endpoint-admin-job --version $VERSION \
|
||||
--namespace kolla --name $x-create-keystone-endpoint-admin \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
done
|
||||
$DIR/tools/wait_for_pods.sh kolla
|
||||
|
||||
for x in cinder glance neutron nova; do
|
||||
|
||||
for x in cinder glance neutron nova heat; do
|
||||
helm delete --purge $x-create-keystone-user
|
||||
done
|
||||
|
||||
|
|
@ -311,7 +329,7 @@ helm install kolla/nova-create-keystone-endpoint-admin-job --version $VERSION \
|
|||
--namespace kolla --name nova-create-keystone-endpoint-admin \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
for x in nova nova-api neutron; do
|
||||
for x in nova nova-api neutron heat; do
|
||||
helm install kolla/$x-create-db-job --version $VERSION \
|
||||
--namespace kolla \
|
||||
--name $x-create-db \
|
||||
|
|
@ -340,7 +358,7 @@ $DIR/tests/bin/endpoint_test.sh
|
|||
[ -d "$WORKSPACE/logs" ] && openstack catalog list > \
|
||||
$WORKSPACE/logs/openstack-catalog-after-bootstrap.json || true
|
||||
|
||||
for x in nova nova-api cinder neutron glance; do
|
||||
for x in nova nova-api cinder neutron glance heat; do
|
||||
helm delete --purge $x-create-db
|
||||
done
|
||||
|
||||
|
|
@ -348,7 +366,9 @@ for x in nova-api cinder neutron glance; do
|
|||
helm delete --purge $x-manage-db
|
||||
done
|
||||
|
||||
for x in glance neutron cinder nova; do
|
||||
|
||||
|
||||
for x in glance neutron cinder nova heat heat-cfn; do
|
||||
helm delete --purge $x-create-keystone-service
|
||||
helm delete --purge $x-create-keystone-endpoint-public
|
||||
helm delete --purge $x-create-keystone-endpoint-internal
|
||||
|
|
|
|||
|
|
@ -140,4 +140,5 @@ helm install kolla/horizon --version $VERSION \
|
|||
|
||||
wait_for_pods kolla nova,horizon running,succeeded
|
||||
|
||||
|
||||
kollakube res delete bootstrap openvswitch-set-external-ip
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ common_mariadb = [
|
|||
'ironic-api-manage-db-job',
|
||||
'ironic-inspector-create-db-job',
|
||||
'ironic-inspector-manage-db-job',
|
||||
'heat-create-db-job',
|
||||
'cinder-delete-db-job',
|
||||
'glance-delete-db-job',
|
||||
'keystone-delete-db-job',
|
||||
|
|
@ -61,7 +62,9 @@ common_mariadb = [
|
|||
'nova-delete-db-job',
|
||||
'nova-api-delete-db-job',
|
||||
'ironic-api-delete-db-job',
|
||||
'ironic-inspector-delete-db-job'
|
||||
'ironic-inspector-delete-db-job',
|
||||
'heat-create-db-job',
|
||||
'heat-delete-db-job'
|
||||
]
|
||||
|
||||
common_create_keystone_admin = [
|
||||
|
|
@ -111,7 +114,19 @@ common_create_keystone_admin = [
|
|||
'ironic-inspector-delete-keystone-service-job',
|
||||
'ironic-inspector-delete-keystone-user-job',
|
||||
'ironic-delete-keystone-service-job',
|
||||
'ironic-delete-keystone-user-job'
|
||||
'ironic-delete-keystone-user-job',
|
||||
'heat-create-keystone-user-job',
|
||||
'heat-create-keystone-service-job',
|
||||
'heat-create-keystone-endpoint-public-job',
|
||||
'heat-create-keystone-endpoint-internal-job',
|
||||
'heat-create-keystone-endpoint-admin-job',
|
||||
'heat-delete-keystone-user-job',
|
||||
'heat-delete-keystone-service-job',
|
||||
'heat-cfn-create-keystone-service-job',
|
||||
'heat-cfn-create-keystone-endpoint-public-job',
|
||||
'heat-cfn-create-keystone-endpoint-internal-job',
|
||||
'heat-cfn-create-keystone-endpoint-admin-job',
|
||||
'heat-cfn-delete-keystone-service-job'
|
||||
]
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue