Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions templates/cinder/config/00-global-defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ project_name = service
{{ end -}}
service_token_roles_required = true
interface = internal
service_type = volumev3

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question I asked in manila/glance about propagating [1].

[1] https://github.com/openstack-k8s-operators/cinder-operator/blob/main/internal/cinder/const.go#L35

{{ if (index . "Region") -}}
region_name = {{ .Region }}
{{ end -}}
Expand Down
3 changes: 2 additions & 1 deletion test/functional/cinder_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,11 @@ var _ = Describe("Cinder controller", func() {
cfg, err := ini.Load([]byte(configData))
Expect(err).ShouldNot(HaveOccurred(), "Should be able to parse config as INI")

// Verify region_name in [keystone_authtoken]
// Verify region_name and service_type in [keystone_authtoken]
section := cfg.Section("keystone_authtoken")
Expect(section).ShouldNot(BeNil(), "Should find [keystone_authtoken] section")
Expect(section.Key("region_name").String()).Should(Equal(testRegion))
Expect(section.Key("service_type").String()).Should(Equal("volumev3"))

// Verify region_name in [nova]
section = cfg.Section("nova")
Expand Down
Loading