openstack
/
cookbook-openstack-network
Code Issues Proposed changes

default: support configuring keystonemiddleware for memcached 

network counterpart of the recent change to openstack-compute.

Signed-off-by: Marek Szuba <m.szuba@gsi.de>
Change-Id: I717bd8f1df136ceef1da519faaa18a1ef62c02cb
This commit is contained in:
Marek Szuba 2021-09-06 12:09:41 +01:00
parent 222df62ab3
commit 1f447d3985
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
attributes/neutron_conf.rb
View File

@ -24,6 +24,7 @@ default['openstack']['network']['conf'].tap do |conf|
conf['keystone_authtoken']['user_domain_name'] = 'Default'
conf['keystone_authtoken']['project_domain_name'] = 'Default'
conf['keystone_authtoken']['project_name'] = 'service'
conf['keystone_authtoken']['memcache_security_strategy'] = nil
conf['keystone_authtoken']['auth_version'] = 'v3'
# [nova] section
conf['nova']['auth_type'] = 'password'

8
recipes/default.rb
View File

@ -68,6 +68,8 @@ if node['openstack']['mq']['service_type'] == 'rabbit'
node.default['openstack']['network']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'network'
end
memcache_servers = memcached_servers.join ','
identity_endpoint = internal_endpoint 'identity'
auth_url = identity_endpoint.to_s
@ -84,6 +86,12 @@ node.default['openstack']['network']['conf'].tap do |conf|
conf['DEFAULT']['bind_port'] = bind_service['port']
conf['nova']['auth_url'] = auth_url
conf['keystone_authtoken']['auth_url'] = auth_url
unless memcache_servers.empty?
conf['keystone_authtoken']['memcached_servers'] = memcache_servers
unless conf['keystone_authtoken']['memcache_security_strategy'].nil?
conf['keystone_authtoken']['memcache_secret_key'] = get_password 'token', 'openstack-network_memcache_secret'
end
end
end
# define secrets that are needed in the neutron.conf.erb