diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 57d195a68a..75181cf3ad 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -487,6 +487,7 @@ masakari_api_listen_port: "{{ masakari_api_port }}" masakari_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}" memcached_port: "11211" +memcache_security_strategy: "ENCRYPT" mistral_internal_fqdn: "{{ kolla_internal_fqdn }}" mistral_external_fqdn: "{{ kolla_external_fqdn }}" diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2 index dfb4e049d3..7aa1d664fb 100644 --- a/ansible/roles/aodh/templates/aodh.conf.j2 +++ b/ansible/roles/aodh/templates/aodh.conf.j2 @@ -17,7 +17,7 @@ max_pool_size = {{ database_max_pool_size }} [keystone_authtoken] service_type = alarming -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} www_authenticate_uri = {{ keystone_internal_url }} diff --git a/ansible/roles/barbican/templates/barbican.conf.j2 b/ansible/roles/barbican/templates/barbican.conf.j2 index a3c727c063..f7085f155e 100644 --- a/ansible/roles/barbican/templates/barbican.conf.j2 +++ b/ansible/roles/barbican/templates/barbican.conf.j2 @@ -70,7 +70,7 @@ auth_type = password cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/blazar/templates/blazar.conf.j2 b/ansible/roles/blazar/templates/blazar.conf.j2 index 2b1f5f5323..4538420804 100644 --- a/ansible/roles/blazar/templates/blazar.conf.j2 +++ b/ansible/roles/blazar/templates/blazar.conf.j2 @@ -33,7 +33,7 @@ service_token_roles_required = True cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 7523b50f55..81e625676f 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -128,7 +128,7 @@ password = {{ cinder_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 index 1a0aa808ea..b000e3e7b7 100644 --- a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 +++ b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 @@ -29,7 +29,7 @@ password = {{ cloudkitty_keystone_password }} region_name = {{ openstack_region_name }} cafile = {{ openstack_cacert }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/cyborg/templates/cyborg.conf.j2 b/ansible/roles/cyborg/templates/cyborg.conf.j2 index af05d8846d..656094ac34 100644 --- a/ansible/roles/cyborg/templates/cyborg.conf.j2 +++ b/ansible/roles/cyborg/templates/cyborg.conf.j2 @@ -16,7 +16,7 @@ max_pool_size = {{ database_max_pool_size }} [keystone_authtoken] service_type = accelerator -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcache_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2 index b74be50182..2fbb768dfb 100644 --- a/ansible/roles/designate/templates/designate.conf.j2 +++ b/ansible/roles/designate/templates/designate.conf.j2 @@ -33,7 +33,7 @@ service_token_roles_required = True cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index c9ce56bdc5..d760dfcc16 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -50,7 +50,7 @@ password = {{ glance_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/gnocchi/templates/gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/gnocchi.conf.j2 index 81dc32693c..2eb1fdaa71 100644 --- a/ansible/roles/gnocchi/templates/gnocchi.conf.j2 +++ b/ansible/roles/gnocchi/templates/gnocchi.conf.j2 @@ -56,7 +56,7 @@ auth_type = password cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index 77240912a2..5b8a1fbb0c 100644 --- a/ansible/roles/heat/templates/heat.conf.j2 +++ b/ansible/roles/heat/templates/heat.conf.j2 @@ -41,7 +41,7 @@ password = {{ heat_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 index 115381c45b..66e0e590a7 100644 --- a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 +++ b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 @@ -56,7 +56,7 @@ password = {{ ironic_inspector_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index 70a9935863..66e0774c1a 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -86,7 +86,7 @@ region_name = {{ openstack_region_name }} valid_interfaces = internal cafile = {{ openstack_cacert }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index acf8b81243..39ea112106 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -92,7 +92,7 @@ password = {{ magnum_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2 index ebff073c1f..98cb78b4e6 100644 --- a/ansible/roles/manila/templates/manila-share.conf.j2 +++ b/ansible/roles/manila/templates/manila-share.conf.j2 @@ -30,7 +30,7 @@ username = {{ cinder_keystone_user }} password = {{ cinder_keystone_password }} cafile = {{ openstack_cacert }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} @@ -47,7 +47,7 @@ username = {{ nova_keystone_user }} password = {{ nova_keystone_password }} cafile = {{ openstack_cacert }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} @@ -65,7 +65,7 @@ username = {{ neutron_keystone_user }} password = {{ neutron_keystone_password }} cafile = {{ openstack_cacert }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2 index ae21fdecc7..1cd53601bf 100644 --- a/ansible/roles/manila/templates/manila.conf.j2 +++ b/ansible/roles/manila/templates/manila.conf.j2 @@ -43,7 +43,7 @@ password = {{ manila_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/masakari/templates/masakari.conf.j2 b/ansible/roles/masakari/templates/masakari.conf.j2 index f02660d28c..10c4ac072c 100644 --- a/ansible/roles/masakari/templates/masakari.conf.j2 +++ b/ansible/roles/masakari/templates/masakari.conf.j2 @@ -36,7 +36,7 @@ region_name = {{ openstack_region_name }} cafile = {{ openstack_cacert }} {% if enable_memcached | bool %} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2 index 97c57eb778..84f86d7ffc 100644 --- a/ansible/roles/mistral/templates/mistral.conf.j2 +++ b/ansible/roles/mistral/templates/mistral.conf.j2 @@ -51,7 +51,7 @@ password = {{ mistral_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 7bb9b23369..68e040ba11 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -117,7 +117,7 @@ password = {{ neutron_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index d4ddb7c671..f55a3e25e6 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -122,7 +122,7 @@ password = {{ nova_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2 index 7d7efd8527..ca59acd35f 100644 --- a/ansible/roles/octavia/templates/octavia.conf.j2 +++ b/ansible/roles/octavia/templates/octavia.conf.j2 @@ -53,7 +53,7 @@ project_name = {{ octavia_service_auth_project }} project_domain_name = {{ default_project_domain_name }} cafile = {{ openstack_cacert }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} @@ -70,7 +70,7 @@ password = {{ octavia_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/placement/templates/placement.conf.j2 b/ansible/roles/placement/templates/placement.conf.j2 index 429fd157ea..ba13cc1450 100644 --- a/ansible/roles/placement/templates/placement.conf.j2 +++ b/ansible/roles/placement/templates/placement.conf.j2 @@ -37,7 +37,7 @@ password = {{ placement_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2 index 6a3ded7c01..4b6982a334 100644 --- a/ansible/roles/swift/templates/proxy-server.conf.j2 +++ b/ansible/roles/swift/templates/proxy-server.conf.j2 @@ -46,7 +46,7 @@ password = {{ swift_keystone_password }} delay_auth_decision = {{ swift_delay_auth_decision }} cafile = {{ openstack_cacert }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/tacker/templates/tacker.conf.j2 b/ansible/roles/tacker/templates/tacker.conf.j2 index 152715d791..21d2fde582 100644 --- a/ansible/roles/tacker/templates/tacker.conf.j2 +++ b/ansible/roles/tacker/templates/tacker.conf.j2 @@ -44,7 +44,7 @@ password = {{ tacker_keystone_password }} cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/watcher/templates/watcher.conf.j2 b/ansible/roles/watcher/templates/watcher.conf.j2 index fb436f37ff..f087b6673d 100644 --- a/ansible/roles/watcher/templates/watcher.conf.j2 +++ b/ansible/roles/watcher/templates/watcher.conf.j2 @@ -32,7 +32,7 @@ service_token_roles_required = True cafile = {{ openstack_cacert }} region_name = {{ openstack_region_name }} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2 index 214f984b9f..03979ac148 100644 --- a/ansible/roles/zun/templates/zun.conf.j2 +++ b/ansible/roles/zun/templates/zun.conf.j2 @@ -41,7 +41,7 @@ region_name = {{ openstack_region_name }} cafile = {{ openstack_cacert }} {% if enable_memcached | bool %} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} @@ -64,7 +64,7 @@ region_name = {{ openstack_region_name }} cafile = {{ openstack_cacert }} {% if enable_memcached | bool %} -memcache_security_strategy = ENCRYPT +memcache_security_strategy = {{ memcache_security_strategy }} memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} diff --git a/releasenotes/notes/bug-1850733-aa3b0d335c8e4e1e.yaml b/releasenotes/notes/bug-1850733-aa3b0d335c8e4e1e.yaml new file mode 100644 index 0000000000..9883b74b9b --- /dev/null +++ b/releasenotes/notes/bug-1850733-aa3b0d335c8e4e1e.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Put memcache_security_strategy in single place at all.yml + For possible config options see `docs `__ + + `LP#1850733 `__