Merge pull request #300 from SeanMooney/cinder

enable cinder config gen for all services
openstack-k8s-operators · Mar 24, 2023 · 14f6bc2 · 14f6bc2
2 parents 6f4ab6f + c82ddaa
commit 14f6bc2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/templates/nova.conf b/templates/nova.conf
@@ -223,7 +223,6 @@ valid_interfaces = internal
 metadata_proxy_shared_secret = {{ .metadata_secret }}
 service_metadata_proxy = true
 
-{{if .enable_cinder }}
 [cinder]
 auth_url = {{ .keystone_internal_url }}
 auth_type = password
@@ -235,4 +234,3 @@ password = {{ .nova_keystone_password }}
 cafile = {{ .openstack_cacert }}
 region_name = {{ .openstack_region_name }}
 catalog_info = volumev3:cinderv3:internalURL
-{{end}}
diff --git a/templates/novaconductor/bin/init.sh b/templates/novaconductor/bin/init.sh
@@ -47,7 +47,8 @@ crudini --set ${SVC_CFG_MERGED} database connection mysql+pymysql://${CELLDBUSER
 crudini --set ${SVC_CFG_MERGED} keystone_authtoken password $PASSWORD
 
 crudini --set ${SVC_CFG_MERGED} placement password $PASSWORD
-
+crudini --set ${SVC_CFG_MERGED} cinder password $PASSWORD
+crudini --set ${SVC_CFG_MERGED} neutron password $PASSWORD
 crudini --set ${SVC_CFG_MERGED} DEFAULT transport_url $TRANSPORT_URL
 
 # set api database connection if provided

diff --git a/templates/novaconductor/config/nova.conf b/templates/novaconductor/config/nova.conf
@@ -21,3 +21,23 @@ user_domain_name = Default
 username = {{ .ServiceUser }}
 auth_url = {{ .KeystonePublicURL }}
 auth_type = password
+
+[cinder]
+auth_url = {{ .KeystonePublicURL }}
+auth_type = password
+project_domain_name = Default
+user_domain_name = Default
+project_name = service
+username ={{ .ServiceUser }}
+region_name = regionOne
+catalog_info = volumev3:cinderv3:internalURL
+
+[neutron]
+auth_url = {{ .KeystonePublicURL }}
+auth_type = password
+project_domain_name = Default
+user_domain_name = Default
+project_name = service
+username = {{ .ServiceUser }}
+region_name = regionOne
+valid_interfaces = internal