Merge "Cinder is missing the v3 API endpoints."
This commit is contained in:
Zuul
Gerrit Code Review
commit
e457a23639
|
|
@ -105,6 +105,9 @@ cinder_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ ci
|
|||
cinder_v2_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_v2_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_v2_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_v3_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v3/%(tenant_id)s"
|
||||
cinder_v3_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v3/%(tenant_id)s"
|
||||
cinder_v3_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ cinder_api_port }}/v3/%(tenant_id)s"
|
||||
|
||||
cinder_logging_debug: "{{ openstack_logging_debug }}"
|
||||
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ SESSION_COOKIE_SECURE = True
|
|||
|
||||
OPENSTACK_API_VERSIONS = {
|
||||
"identity": 3,
|
||||
"volume": 2,
|
||||
}
|
||||
|
||||
# Set this to True if running on a multi-domain model. When this is enabled, it
|
||||
|
|
|
|||
|
|
@ -181,9 +181,12 @@ openstack_cinder_auth: "{'auth_url':'{{ keystone_auth_url }}','username':'{{ ope
|
|||
cinder_admin_endpoint: "http://cinder-api:{{ cinder_api_port }}/v1/%(tenant_id)s"
|
||||
cinder_public_endpoint: "http://{{ kolla_kubernetes_external_vip }}:{{ cinder_api_port }}/v1/%(tenant_id)s"
|
||||
cinder_internal_endpoint: "http://cinder-api:{{ cinder_api_port }}/v1/%(tenant_id)s"
|
||||
cinder_admin_endpointv2: "http://cinder-api:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_public_endpointv2: "http://{{ kolla_kubernetes_external_vip }}:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_internal_endpointv2: "http://cinder-api:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_v2_admin_endpoint: "http://cinder-api:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_v2_public_endpoint: "http://{{ kolla_kubernetes_external_vip }}:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_v2_internal_endpoint: "http://cinder-api:{{ cinder_api_port }}/v2/%(tenant_id)s"
|
||||
cinder_v3_admin_endpoint: "http://cinder-api:{{ cinder_api_port }}/v3/%(tenant_id)s"
|
||||
cinder_v3_public_endpoint: "http://{{ kolla_kubernetes_external_vip }}:{{ cinder_api_port }}/v3/%(tenant_id)s"
|
||||
cinder_v3_internal_endpoint: "http://cinder-api:{{ cinder_api_port }}/v3/%(tenant_id)s"
|
||||
|
||||
#######################
|
||||
# Configuration below, allows to configure multiple backends for Cinder.
|
||||
|
|
|
|||
|
|
@ -1017,6 +1017,17 @@ cinder-create-keystone-endpoint-adminv2-job:
|
|||
all:
|
||||
service: cinder-api
|
||||
|
||||
cinder-create-keystone-endpoint-adminv3-job:
|
||||
global:
|
||||
kolla:
|
||||
cinder:
|
||||
api:
|
||||
all:
|
||||
port: 8776
|
||||
create_keystone_endpoint:
|
||||
all:
|
||||
service: cinder-api
|
||||
|
||||
cinder-create-keystone-endpoint-public-job:
|
||||
global:
|
||||
kolla:
|
||||
|
|
@ -1037,6 +1048,16 @@ cinder-create-keystone-endpoint-publicv2-job:
|
|||
all:
|
||||
port: 8776
|
||||
|
||||
cinder-create-keystone-endpoint-publicv3-job:
|
||||
global:
|
||||
kolla:
|
||||
all:
|
||||
external_vip:
|
||||
cinder:
|
||||
api:
|
||||
all:
|
||||
port: 8776
|
||||
|
||||
cinder-create-keystone-endpoint-internal-job:
|
||||
global:
|
||||
kolla:
|
||||
|
|
@ -1059,6 +1080,17 @@ cinder-create-keystone-endpoint-internalv2-job:
|
|||
all:
|
||||
service: cinder-api
|
||||
|
||||
cinder-create-keystone-endpoint-internalv3-job:
|
||||
global:
|
||||
kolla:
|
||||
cinder:
|
||||
api:
|
||||
all:
|
||||
port: 8776
|
||||
create_keystone_endpoint:
|
||||
all:
|
||||
service: cinder-api
|
||||
|
||||
tgtd-daemonset:
|
||||
global:
|
||||
kolla:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
name: cinder-create-keystone-endpoint-adminv3-job
|
||||
version: 0.7.0-1 #FIXME make this changable
|
||||
description: Helm chart for creating cinder admin keystone v3 endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- cinder
|
||||
- keystone-endpoint-admin
|
||||
- v3
|
||||
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,4 @@
|
|||
dependencies:
|
||||
- name: kolla-common
|
||||
repository: file://../../kolla-common
|
||||
version: 0.7.0-1
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{{- $searchPath := ":global.kolla.cinder.create_keystone_endpoint.adminv3.job:global.kolla.cinder.create_keystone_endpoint.all:global.kolla.cinder.api.all:global.kolla.cinder.all:global.kolla.all" }}
|
||||
{{- $resourceName := "cinder-create-keystone-endpoint-adminv3" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "cinder" }}
|
||||
{{- $serviceType := "volume" }}
|
||||
{{- $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) }}
|
||||
{{- $cinderAdminEndpointBuilt := printf "http://%s:%s/v3/%%(tenant_id)s" $service $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $cinderAdminEndpointBuilt }}
|
||||
{{- $postfix := "v3" }}
|
||||
{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "postfix" $postfix "Release" .Release "Values" .Values "searchPath" $searchPath }}
|
||||
{{- include "common_create_keystone_endpoint" $env }}
|
||||
{{- end }}
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: cinder-create-keystone-endpoint-internalv3-job
|
||||
version: 0.7.0-1 #FIXME make this changable
|
||||
description: Helm chart for creating cinder internal keystone v3 endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- cinder
|
||||
- keystone-endpoint-internal
|
||||
- v3
|
||||
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,4 @@
|
|||
dependencies:
|
||||
- name: kolla-common
|
||||
repository: file://../../kolla-common
|
||||
version: 0.7.0-1
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{{- $searchPath := ":global.kolla.cinder.create_keystone_endpoint.internalv3.job:global.kolla.cinder.create_keystone_endpoint.all:global.kolla.cinder.api.all:global.kolla.cinder.all:global.kolla.all" }}
|
||||
{{- $resourceName := "cinder-create-keystone-endpoint-internalv3" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "cinder" }}
|
||||
{{- $serviceType := "volume" }}
|
||||
{{- $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) }}
|
||||
{{- $cinderInternalEndpointBuilt := printf "http://%s:%s/v3/%%(tenant_id)s" $service $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $cinderInternalEndpointBuilt }}
|
||||
{{- $postfix := "v3" }}
|
||||
{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "postfix" $postfix "Release" .Release "Values" .Values "searchPath" $searchPath }}
|
||||
{{- include "common_create_keystone_endpoint" $env }}
|
||||
{{- end }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: cinder-create-keystone-endpoint-publicv3-job
|
||||
version: 0.7.0-1 #FIXME make this changable
|
||||
description: Helm chart for creating cinder public keystone v3 endpoint
|
||||
keywords:
|
||||
- openstack
|
||||
- cinder
|
||||
- keystone-endpoint-public
|
||||
- v3
|
||||
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,4 @@
|
|||
dependencies:
|
||||
- name: kolla-common
|
||||
repository: file://../../kolla-common
|
||||
version: 0.7.0-1
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{{- $searchPath := ":global.kolla.cinder.create_keystone_endpoint.publicv3.job:global.kolla.cinder.create_keystone_endpoint.all:global.kolla.cinder.api.all:global.kolla.cinder.all:global.kolla.all" }}
|
||||
{{- $resourceName := "cinder-create-keystone-endpoint-publicv3" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "cinder" }}
|
||||
{{- $serviceType := "volume" }}
|
||||
{{- $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 ) }}
|
||||
{{- $cinderPublicEndpointBuilt := printf "http://%s:%s/v3/%%(tenant_id)s" $externalVip $port }}
|
||||
{{- $endpointURLFullUser := include "kolla_val_get_str" (dict "key" "endpoint" "searchPath" $searchPath "Values" .Values ) }}
|
||||
{{- $endpointURLFull := $endpointURLFullUser | default $cinderPublicEndpointBuilt }}
|
||||
{{- $postfix := "v3" }}
|
||||
{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "interface" $interface "endpointURLFull" $endpointURLFull "postfix" $postfix "Release" .Release "Values" .Values "searchPath" $searchPath }}
|
||||
{{- include "common_create_keystone_endpoint" $env }}
|
||||
{{- end }}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: cinder-create-keystone-servicev3-job
|
||||
version: 0.7.0-1 #FIXME make this changable
|
||||
description: FIXME
|
||||
keywords:
|
||||
- openstack
|
||||
- cinder
|
||||
- keystone-service
|
||||
- v3
|
||||
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,4 @@
|
|||
dependencies:
|
||||
- name: kolla-common
|
||||
repository: file://../../kolla-common
|
||||
version: 0.7.0-1
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{{- $searchPath := ":global.kolla.cinder.create_keystone_servicev3.job:global.kolla.cinder.create_keystone_servicev3.all:global.kolla.cinder.all:global.kolla.all" }}
|
||||
{{- $resourceName := "cinder-create-keystone-servicev3" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "cinder" }}
|
||||
{{- $serviceType := "volume" }}
|
||||
{{- $description := "Openstack Block Storage" }}
|
||||
{{- $postfix := "v3" }}
|
||||
{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "description" $description "postfix" $postfix "Values" .Values "Release" .Release "searchPath" $searchPath }}
|
||||
{{- include "common_create_keystone_service" $env }}
|
||||
{{- end }}
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: cinder-delete-keystone-servicev3-job
|
||||
version: 0.7.0-1
|
||||
description: Helm chart to delete the cinder keystone servicev3
|
||||
keywords:
|
||||
- openstack
|
||||
- cinder
|
||||
- delete
|
||||
- servicev3
|
||||
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,4 @@
|
|||
dependencies:
|
||||
- name: kolla-common
|
||||
repository: file://../../kolla-common
|
||||
version: 0.7.0-1
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{{- $searchPath := ":global.kolla.cinder.delete_keystone_servicev3.job:global.kolla.cinder.delete_keystone_servicev3.all:global.kolla.cinder.all:global.kolla.all" }}
|
||||
{{- $resourceName := "cinder-delete-keystone-servicev3" }}
|
||||
{{- $netHostTrue := false }}
|
||||
{{- $podTypeBootstrap := true }}
|
||||
{{- $serviceName := "cinder" }}
|
||||
{{- $serviceType := "volume" }}
|
||||
{{- $description := "Openstack Block Storage" }}
|
||||
{{- $postfix := "v3" }}
|
||||
{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "description" $description "postfix" $postfix "Values" .Values "Release" .Release "searchPath" $searchPath }}
|
||||
{{- include "common_delete_keystone_service" $env }}
|
||||
{{- end }}
|
||||
|
||||
|
|
@ -8,6 +8,9 @@ dependencies:
|
|||
- name: cinder-delete-keystone-servicev2-job
|
||||
repository: file://../../microservice/cinder-delete-keystone-servicev2-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-delete-keystone-servicev3-job
|
||||
repository: file://../../microservice/cinder-delete-keystone-servicev3-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-delete-keystone-user-job
|
||||
repository: file://../../microservice/cinder-delete-keystone-user-job
|
||||
version: 0.7.0-1
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ dependencies:
|
|||
- name: cinder-create-keystone-servicev2-job
|
||||
repository: file://../../microservice/cinder-create-keystone-servicev2-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-create-keystone-servicev3-job
|
||||
repository: file://../../microservice/cinder-create-keystone-servicev3-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-create-keystone-user-job
|
||||
repository: file://../../microservice/cinder-create-keystone-user-job
|
||||
version: 0.7.0-1
|
||||
|
|
@ -35,6 +38,15 @@ dependencies:
|
|||
- name: cinder-create-keystone-endpoint-adminv2-job
|
||||
repository: file://../../microservice/cinder-create-keystone-endpoint-adminv2-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-create-keystone-endpoint-publicv3-job
|
||||
repository: file://../../microservice/cinder-create-keystone-endpoint-publicv3-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-create-keystone-endpoint-internalv3-job
|
||||
repository: file://../../microservice/cinder-create-keystone-endpoint-internalv3-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-create-keystone-endpoint-adminv3-job
|
||||
repository: file://../../microservice/cinder-create-keystone-endpoint-adminv3-job
|
||||
version: 0.7.0-1
|
||||
- name: cinder-api-deployment
|
||||
repository: file://../../microservice/cinder-api-deployment
|
||||
version: 0.7.0-1
|
||||
|
|
|
|||
|
|
@ -87,6 +87,33 @@ global:
|
|||
- cinder-create-keystone-user
|
||||
service:
|
||||
- keystone-admin
|
||||
publicv3:
|
||||
job:
|
||||
dependencies:
|
||||
jobs:
|
||||
- cinder-create-keystone-servicev3
|
||||
- cinder-create-keystone-user
|
||||
- cinder-create-keystone-endpoint-internalv3
|
||||
- cinder-create-keystone-endpoint-adminv3
|
||||
service:
|
||||
- keystone-admin
|
||||
internalv3:
|
||||
job:
|
||||
dependencies:
|
||||
jobs:
|
||||
- cinder-create-keystone-servicev3
|
||||
- cinder-create-keystone-user
|
||||
- cinder-create-keystone-endpoint-adminv3
|
||||
service:
|
||||
- keystone-admin
|
||||
adminv3:
|
||||
job:
|
||||
dependencies:
|
||||
jobs:
|
||||
- cinder-create-keystone-servicev3
|
||||
- cinder-create-keystone-user
|
||||
service:
|
||||
- keystone-admin
|
||||
api:
|
||||
deployment:
|
||||
dependencies:
|
||||
|
|
@ -97,6 +124,9 @@ global:
|
|||
- cinder-create-keystone-endpoint-publicv2
|
||||
- cinder-create-keystone-endpoint-internalv2
|
||||
- cinder-create-keystone-endpoint-adminv2
|
||||
- cinder-create-keystone-endpoint-publicv3
|
||||
- cinder-create-keystone-endpoint-internalv3
|
||||
- cinder-create-keystone-endpoint-adminv3
|
||||
- cinder-create-db
|
||||
- cinder-manage-db
|
||||
service:
|
||||
|
|
@ -114,6 +144,9 @@ global:
|
|||
- cinder-create-keystone-endpoint-publicv2
|
||||
- cinder-create-keystone-endpoint-internalv2
|
||||
- cinder-create-keystone-endpoint-adminv2
|
||||
- cinder-create-keystone-endpoint-publicv3
|
||||
- cinder-create-keystone-endpoint-internalv3
|
||||
- cinder-create-keystone-endpoint-adminv3
|
||||
- cinder-create-db
|
||||
- cinder-manage-db
|
||||
service:
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ global:
|
|||
- cinder-create-keystone-endpoint-publicv2
|
||||
- cinder-create-keystone-endpoint-internalv2
|
||||
- cinder-create-keystone-endpoint-adminv2
|
||||
- cinder-create-keystone-endpoint-publicv3
|
||||
- cinder-create-keystone-endpoint-internalv3
|
||||
- cinder-create-keystone-endpoint-adminv3
|
||||
- cinder-create-db
|
||||
- cinder-manage-db
|
||||
service:
|
||||
|
|
|
|||
|
|
@ -227,6 +227,10 @@ helm install kolla/cinder-create-keystone-servicev2-job --version $VERSION \
|
|||
--namespace kolla --name cinder-create-keystone-servicev2 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/cinder-create-keystone-servicev3-job --version $VERSION \
|
||||
--namespace kolla --name cinder-create-keystone-servicev3 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
if [ "x$branch" != "x2" -a "x$branch" != "x3" ]; then
|
||||
helm install kolla/nova-placement-create-keystone-service-job --debug --version $VERSION \
|
||||
--namespace kolla --name nova-placement-create-keystone-service \
|
||||
|
|
@ -264,6 +268,10 @@ helm install kolla/cinder-create-keystone-endpoint-publicv2-job --version $VERSI
|
|||
--namespace kolla --name cinder-create-keystone-endpoint-publicv2 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/cinder-create-keystone-endpoint-publicv3-job --version $VERSION \
|
||||
--namespace kolla --name cinder-create-keystone-endpoint-publicv3 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/glance-create-keystone-endpoint-public-job --version $VERSION \
|
||||
--namespace kolla --name glance-create-keystone-endpoint-public \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
|
@ -348,6 +356,10 @@ helm install kolla/cinder-create-keystone-endpoint-internalv2-job --version $VER
|
|||
--namespace kolla --name cinder-create-keystone-endpoint-internalv2 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/cinder-create-keystone-endpoint-internalv3-job --version $VERSION \
|
||||
--namespace kolla --name cinder-create-keystone-endpoint-internalv3 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/cinder-create-keystone-endpoint-admin-job --version $VERSION \
|
||||
--namespace kolla --name cinder-create-keystone-endpoint-admin \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
|
@ -356,6 +368,10 @@ helm install kolla/cinder-create-keystone-endpoint-adminv2-job --version $VERSIO
|
|||
--namespace kolla --name cinder-create-keystone-endpoint-adminv2 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/cinder-create-keystone-endpoint-adminv3-job --version $VERSION \
|
||||
--namespace kolla --name cinder-create-keystone-endpoint-adminv3 \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
||||
helm install kolla/glance-create-keystone-endpoint-internal-job --version $VERSION \
|
||||
--namespace kolla --name glance-create-keystone-endpoint-internal \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
|
@ -423,6 +439,11 @@ 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 delete --purge cinder-create-keystone-servicev3
|
||||
helm delete --purge cinder-create-keystone-endpoint-publicv3
|
||||
helm delete --purge cinder-create-keystone-endpoint-internalv3
|
||||
helm delete --purge cinder-create-keystone-endpoint-adminv3
|
||||
|
||||
helm install kolla/cinder-volume-ceph-statefulset --version $VERSION \
|
||||
--namespace kolla --name cinder-volume-ceph-statefulset \
|
||||
--values /tmp/general_config.yaml --values /tmp/ceph_config.yaml
|
||||
|
|
|
|||
|
|
@ -102,14 +102,20 @@ common_create_keystone_admin = [
|
|||
'nova-placement-create-keystone-endpoint-admin-job',
|
||||
'cinder-create-keystone-service-job',
|
||||
'cinder-create-keystone-servicev2-job',
|
||||
'cinder-create-keystone-servicev3-job',
|
||||
'cinder-create-keystone-endpoint-public-job',
|
||||
'cinder-create-keystone-endpoint-internal-job',
|
||||
'cinder-create-keystone-endpoint-internalv2-job',
|
||||
'cinder-create-keystone-endpoint-internalv3-job',
|
||||
'cinder-create-keystone-endpoint-admin-job',
|
||||
'cinder-create-keystone-endpoint-publicv2-job',
|
||||
'cinder-create-keystone-endpoint-internalv2-job',
|
||||
'cinder-create-keystone-endpoint-publicv3-job',
|
||||
'cinder-create-keystone-endpoint-adminv-job',
|
||||
'cinder-create-keystone-endpoint-adminv2-job',
|
||||
'cinder-create-keystone-endpoint-adminv3-job',
|
||||
'cinder-delete-keystone-service-job',
|
||||
'cinder-delete-keystone-servicev2-job',
|
||||
'cinder-delete-keystone-servicev3-job',
|
||||
'cinder-delete-keystone-user-job',
|
||||
'glance-delete-keystone-service-job',
|
||||
'glance-delete-keystone-user-job',
|
||||
|
|
@ -203,8 +209,9 @@ def main():
|
|||
f.write("# and rerun tools/helm_prebuild.py\n")
|
||||
f.write(yaml.safe_dump(pkg_values, default_flow_style=False))
|
||||
if sys.stdout.isatty():
|
||||
sys.stdout.write("\r \n")
|
||||
sys.stdout.flush()
|
||||
sys.stdout.write("\r \n")
|
||||
sys.stdout.flush()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
|
|
|
|||
Loading…
Reference in New Issue