openstack/kolla-ansible
Code Issues Proposed changes

Remove default(omit) from openstack_cacert in templates

Browse Source 
The use of default(omit) is for module parameters, not templates. We
define a default value for openstack_cacert, so it should never be
undefined anyway.

Change-Id: Idfa73097ca168c76559dc4f3aa8bb30b7113ab28
This commit is contained in:
Mark Goddard 2020-04-03 14:49:08 +01:00
parent c791943356
commit 0edad7138c
49 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/aodh/templates/aodh.conf.j2
View File

@ -25,7 +25,7 @@ username = {{ aodh_keystone_user }}
password = {{ aodh_keystone_password }} password = {{ aodh_keystone_password }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[oslo_middleware] [oslo_middleware]
enable_proxy_headers_parsing = True enable_proxy_headers_parsing = True
@ -45,7 +45,7 @@ project_domain_id = {{ default_project_domain_id }}
user_domain_id = {{ default_user_domain_id }} user_domain_id = {{ default_user_domain_id }}
auth_type = password auth_type = password
interface = internal interface = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[oslo_messaging_notifications] [oslo_messaging_notifications]
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}

2
ansible/roles/barbican/templates/barbican.conf.j2
View File

@ -59,7 +59,7 @@ username = {{ barbican_keystone_user }}
password = {{ barbican_keystone_password }} password = {{ barbican_keystone_password }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/blazar/templates/blazar.conf.j2
View File

@ -32,7 +32,7 @@ project_name = service
username = {{ blazar_keystone_user }} username = {{ blazar_keystone_user }}
password = {{ blazar_keystone_password }} password = {{ blazar_keystone_password }}
service_token_roles_required = True service_token_roles_required = True
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/ceilometer/templates/ceilometer.conf.j2
View File

@ -21,7 +21,7 @@ project_domain_id = {{ default_project_domain_id }}
user_domain_id = {{ default_user_domain_id }} user_domain_id = {{ default_user_domain_id }}
auth_type = password auth_type = password
interface = internal interface = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% if nova_compute_virt_type == 'vmware' %} {% if nova_compute_virt_type == 'vmware' %}
[vmware] [vmware]

6
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -17,7 +17,7 @@ glance_api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_add
glance_num_retries = {{ groups['glance-api'] | length }} glance_num_retries = {{ groups['glance-api'] | length }}
glance_api_version = 2 glance_api_version = 2
glance_ca_certificates_file = {{ openstack_cacert | default(omit) }} glance_ca_certificates_file = {{ openstack_cacert }}
os_region_name = {{ openstack_region_name }} os_region_name = {{ openstack_region_name }}
@ -87,7 +87,7 @@ region_name = {{ openstack_region_name }}
project_name = service project_name = service
username = {{ nova_keystone_user }} username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }} password = {{ nova_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[database] [database]
connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{{ cinder_database_address }}/{{ cinder_database_name }} connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{{ cinder_database_address }}/{{ cinder_database_name }}
@ -102,7 +102,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ cinder_keystone_user }} username = {{ cinder_keystone_user }}
password = {{ cinder_keystone_password }} password = {{ cinder_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
View File

@ -24,7 +24,7 @@ project_name = service
username = {{ cloudkitty_keystone_user }} username = {{ cloudkitty_keystone_user }}
password = {{ cloudkitty_keystone_password }} password = {{ cloudkitty_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/congress/templates/congress.conf.j2
View File

@ -37,7 +37,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ congress_keystone_user }} username = {{ congress_keystone_user }}
password = {{ congress_keystone_password }} password = {{ congress_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/cyborg/templates/cyborg.conf.j2
View File

@ -25,7 +25,7 @@ username = {{ cyborg_keystone_user }}
password = {{ cyborg_keystone_password }} password = {{ cyborg_keystone_password }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ keystone_admin_port }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ keystone_admin_port }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% if cyborg_policy_file is defined %} {% if cyborg_policy_file is defined %}
[oslo_policy] [oslo_policy]

2
ansible/roles/designate/templates/designate.conf.j2
View File

@ -29,7 +29,7 @@ username = {{ designate_keystone_user }}
password = {{ designate_keystone_password }} password = {{ designate_keystone_password }}
http_connect_timeout = 60 http_connect_timeout = 60
service_token_roles_required = True service_token_roles_required = True
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/freezer/templates/freezer.conf.j2
View File

@ -30,7 +30,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ freezer_keystone_user }} username = {{ freezer_keystone_user }}
password = {{ freezer_keystone_password }} password = {{ freezer_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -39,7 +39,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ glance_keystone_user }} username = {{ glance_keystone_user }}
password = {{ glance_keystone_password }} password = {{ glance_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/glance/templates/glance-swift.conf.j2
View File

@ -5,4 +5,4 @@ user = service:{{ glance_keystone_user }}
key = {{ glance_keystone_password }} key = {{ glance_keystone_password }}
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}

2
ansible/roles/gnocchi/templates/gnocchi.conf.j2
View File

@ -51,7 +51,7 @@ username = {{ gnocchi_keystone_user }}
password = {{ gnocchi_keystone_password }} password = {{ gnocchi_keystone_password }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

4
ansible/roles/heat/templates/heat.conf.j2
View File

@ -49,7 +49,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ heat_keystone_user }} username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }} password = {{ heat_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -89,7 +89,7 @@ policy_file = {{ heat_policy_file }}
[clients] [clients]
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert | default(omit) }} ca_file = {{ openstack_cacert }}
[oslo_middleware] [oslo_middleware]
enable_proxy_headers_parsing = True enable_proxy_headers_parsing = True

4
ansible/roles/ironic/templates/ironic-inspector.conf.j2
View File

@ -22,7 +22,7 @@ project_name = service
username = {{ ironic_inspector_keystone_user }} username = {{ ironic_inspector_keystone_user }}
password = {{ ironic_inspector_keystone_password }} password = {{ ironic_inspector_keystone_password }}
os_endpoint_type = internalURL os_endpoint_type = internalURL
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% else %} {% else %}
auth_type = none auth_type = none
endpoint_override = {{ ironic_internal_endpoint }} endpoint_override = {{ ironic_internal_endpoint }}
@ -38,7 +38,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ ironic_inspector_keystone_user }} username = {{ ironic_inspector_keystone_user }}
password = {{ ironic_inspector_keystone_password }} password = {{ ironic_inspector_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

14
ansible/roles/ironic/templates/ironic.conf.j2
View File

@ -63,7 +63,7 @@ username = {{ ironic_keystone_user }}
password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -81,7 +81,7 @@ username = {{ ironic_keystone_user }}
password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
{% if enable_glance | bool %} {% if enable_glance | bool %}
@ -95,7 +95,7 @@ username = {{ ironic_keystone_user }}
password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
{% if enable_neutron | bool %} {% if enable_neutron | bool %}
@ -110,7 +110,7 @@ password = {{ ironic_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cleaning_network = {{ ironic_cleaning_network }} cleaning_network = {{ ironic_cleaning_network }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
{% if enable_nova | bool %} {% if enable_nova | bool %}
@ -124,7 +124,7 @@ username = {{ ironic_keystone_user }}
password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
[inspector] [inspector]
@ -138,7 +138,7 @@ username = {{ ironic_keystone_user }}
password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% else %} {% else %}
auth_type = none auth_type = none
endpoint_override = {{ ironic_inspector_internal_endpoint }} endpoint_override = {{ ironic_inspector_internal_endpoint }}
@ -155,7 +155,7 @@ username = {{ ironic_keystone_user }}
password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% else %} {% else %}
auth_type = none auth_type = none
endpoint_override = {{ internal_protocol }}://{{ ironic_internal_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }} endpoint_override = {{ internal_protocol }}://{{ ironic_internal_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}

4
ansible/roles/karbor/templates/karbor.conf.j2
View File

@ -19,7 +19,7 @@ username = {{ karbor_keystone_user }}
password = {{ karbor_keystone_password }} password = {{ karbor_keystone_password }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[clients_keystone] [clients_keystone]
auth_uri = {{ keystone_internal_url }} auth_uri = {{ keystone_internal_url }}
@ -40,7 +40,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ karbor_keystone_user }} username = {{ karbor_keystone_user }}
password = {{ karbor_keystone_password }} password = {{ karbor_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/kibana/templates/kibana.yml.j2
View File

@ -6,4 +6,4 @@ elasticsearch.url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_addre
elasticsearch.requestTimeout: {{ kibana_elasticsearch_request_timeout }} elasticsearch.requestTimeout: {{ kibana_elasticsearch_request_timeout }}
elasticsearch.shardTimeout: {{ kibana_elasticsearch_shard_timeout }} elasticsearch.shardTimeout: {{ kibana_elasticsearch_shard_timeout }}
elasticsearch.ssl.verificationMode: "{{ 'full' if kibana_elasticsearch_ssl_verify | bool else 'none' }}" elasticsearch.ssl.verificationMode: "{{ 'full' if kibana_elasticsearch_ssl_verify | bool else 'none' }}"
elasticsearch.ssl.certificateAuthorities: {{ openstack_cacert | default(omit) }} elasticsearch.ssl.certificateAuthorities: {{ openstack_cacert }}

2
ansible/roles/kuryr/templates/kuryr.conf.j2
View File

@ -21,7 +21,7 @@ project_domain_id = {{ default_project_domain_id }}
user_domain_id = {{ default_user_domain_id }} user_domain_id = {{ default_user_domain_id }}
password = {{ kuryr_keystone_password }} password = {{ kuryr_keystone_password }}
username = {{ kuryr_keystone_user }} username = {{ kuryr_keystone_user }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% if kuryr_policy_file is defined %} {% if kuryr_policy_file is defined %}
[oslo_policy] [oslo_policy]

2
ansible/roles/magnum/templates/magnum.conf.j2
View File

@ -65,7 +65,7 @@ user_domain_name = {{ default_user_domain_name }}
project_name = service project_name = service
username = {{ magnum_keystone_user }} username = {{ magnum_keystone_user }}
password = {{ magnum_keystone_password }} password = {{ magnum_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

6
ansible/roles/manila/templates/manila-share.conf.j2
View File

@ -16,7 +16,7 @@ endpoint_type = internalURL
project_name = service project_name = service
username = cinder username = cinder
password = {{ cinder_keystone_password }} password = {{ cinder_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -33,7 +33,7 @@ endpoint_type = internalURL
project_name = service project_name = service
username = {{ nova_keystone_user }} username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }} password = {{ nova_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -51,7 +51,7 @@ endpoint_type = internalURL
project_name = service project_name = service
username = {{ neutron_keystone_user }} username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/manila/templates/manila.conf.j2
View File

@ -37,7 +37,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ manila_keystone_user }} username = {{ manila_keystone_user }}
password = {{ manila_keystone_password }} password = {{ manila_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/masakari/templates/masakari-monitors.conf.j2
View File

@ -10,7 +10,7 @@ project_name = service
project_domain_id = {{ default_project_domain_id }} project_domain_id = {{ default_project_domain_id }}
username = {{ masakari_keystone_user }} username = {{ masakari_keystone_user }}
password = {{ masakari_keystone_password }} password = {{ masakari_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
api_interface = internal api_interface = internal
[libvirt] [libvirt]

2
ansible/roles/masakari/templates/masakari.conf.j2
View File

@ -28,7 +28,7 @@ username = {{ masakari_keystone_user }}
password = {{ masakari_keystone_password }} password = {{ masakari_keystone_password }}
service_token_roles_required = True service_token_roles_required = True
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% if enable_memcached | bool %} {% if enable_memcached | bool %}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT

2
ansible/roles/mistral/templates/mistral.conf.j2
View File

@ -45,7 +45,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ mistral_keystone_user }} username = {{ mistral_keystone_user }}
password = {{ mistral_keystone_password }} password = {{ mistral_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/monasca/templates/monasca-api/api.conf.j2
View File

@ -36,7 +36,7 @@ project_name = service
username = {{ monasca_keystone_user }} username = {{ monasca_keystone_user }}
password = {{ monasca_keystone_password }} password = {{ monasca_keystone_password }}
service_token_roles_required=True service_token_roles_required=True
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2
View File

@ -36,7 +36,7 @@ project_name = service
username = {{ monasca_keystone_user }} username = {{ monasca_keystone_user }}
password = {{ monasca_keystone_password }} password = {{ monasca_keystone_password }}
service_token_roles_required=True service_token_roles_required=True
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

14
ansible/roles/murano/templates/murano.conf.j2
View File

@ -27,7 +27,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ murano_keystone_user }} username = {{ murano_keystone_user }}
password = {{ murano_keystone_password }} password = {{ murano_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -42,7 +42,7 @@ user_domain_name = {{ default_user_domain_name }}
project_name = service project_name = service
username = {{ murano_keystone_user }} username = {{ murano_keystone_user }}
password = {{ murano_keystone_password }} password = {{ murano_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[murano] [murano]
url = {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ murano_api_port }} url = {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ murano_api_port }}
@ -80,22 +80,22 @@ auth_url = {{ keystone_internal_url }}/v3
username = {{ murano_keystone_user }} username = {{ murano_keystone_user }}
password = {{ murano_keystone_password }} password = {{ murano_keystone_password }}
user_domain_name = {{ default_project_domain_name }} user_domain_name = {{ default_project_domain_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
{% endif %} {% endif %}
[neutron] [neutron]
endpoint_type = internalURL endpoint_type = internalURL
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[heat] [heat]
endpoint_type = internalURL endpoint_type = internalURL
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[glance] [glance]
endpoint_type = internalURL endpoint_type = internalURL
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[mistral] [mistral]
endpoint_type = internalURL endpoint_type = internalURL
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}

2
ansible/roles/neutron/templates/metadata_agent.ini.j2
View File

@ -1,6 +1,6 @@
# metadata_agent.ini # metadata_agent.ini
[DEFAULT] [DEFAULT]
auth_ca_cert = {{ openstack_cacert | default(omit) }} auth_ca_cert = {{ openstack_cacert }}
nova_metadata_host = {{ nova_internal_fqdn }} nova_metadata_host = {{ nova_internal_fqdn }}
nova_metadata_port = {{ nova_metadata_port }} nova_metadata_port = {{ nova_metadata_port }}
metadata_proxy_shared_secret = {{ metadata_secret }} metadata_proxy_shared_secret = {{ metadata_secret }}

8
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -84,7 +84,7 @@ project_name = service
username = {{ nova_keystone_user }} username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }} password = {{ nova_keystone_password }}
endpoint_type = internal endpoint_type = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[oslo_middleware] [oslo_middleware]
enable_proxy_headers_parsing = True enable_proxy_headers_parsing = True
@ -108,7 +108,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ neutron_keystone_user }} username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -151,7 +151,7 @@ password = {{ designate_keystone_password }}
allow_reverse_dns_lookup = True allow_reverse_dns_lookup = True
ipv4_ptr_zone_prefix_size = 24 ipv4_ptr_zone_prefix_size = 24
ipv6_ptr_zone_prefix_size = 116 ipv6_ptr_zone_prefix_size = 116
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
{% if enable_osprofiler | bool %} {% if enable_osprofiler | bool %}
@ -172,7 +172,7 @@ project_name = service
project_domain_name = {{ default_project_domain_name }} project_domain_name = {{ default_project_domain_name }}
os_region_name = {{ openstack_region_name }} os_region_name = {{ openstack_region_name }}
os_interface = internal os_interface = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[privsep] [privsep]
helper_command=sudo neutron-rootwrap /etc/neutron/rootwrap.conf privsep-helper helper_command=sudo neutron-rootwrap /etc/neutron/rootwrap.conf privsep-helper

14
ansible/roles/nova-cell/templates/nova.conf.j2
View File

@ -90,7 +90,7 @@ proxyclient_address = {{ api_interface_address }}
username = {{ ironic_keystone_user }} username = {{ ironic_keystone_user }}
password = {{ ironic_keystone_password }} password = {{ ironic_keystone_password }}
auth_url = {{ openstack_auth.auth_url }}/v3 auth_url = {{ openstack_auth.auth_url }}/v3
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
auth_type = password auth_type = password
project_name = service project_name = service
user_domain_name = {{ default_user_domain_name }} user_domain_name = {{ default_user_domain_name }}
@ -104,14 +104,14 @@ lock_path = /var/lib/nova/tmp
[glance] [glance]
api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }} api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
num_retries = 3 num_retries = 3
{% if enable_cinder | bool %} {% if enable_cinder | bool %}
[cinder] [cinder]
catalog_info = volumev3:cinderv3:internalURL catalog_info = volumev3:cinderv3:internalURL
os_region_name = {{ openstack_region_name }} os_region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
[neutron] [neutron]
@ -122,7 +122,7 @@ ovs_bridge = {{ ovs_bridge }}
{% endif %} {% endif %}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
project_domain_name = {{ default_project_domain_name }} project_domain_name = {{ default_project_domain_name }}
user_domain_id = {{ default_user_domain_id }} user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
@ -188,7 +188,7 @@ helper_command=sudo nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --confi
[glance] [glance]
debug = {{ nova_logging_debug }} debug = {{ nova_logging_debug }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[guestfs] [guestfs]
debug = {{ nova_logging_debug }} debug = {{ nova_logging_debug }}
@ -202,7 +202,7 @@ user_domain_name = {{ default_user_domain_name }}
project_name = service project_name = service
project_domain_name = {{ default_project_domain_name }} project_domain_name = {{ default_project_domain_name }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
valid_interfaces = internal valid_interfaces = internal
[notifications] [notifications]
@ -227,7 +227,7 @@ connection_string = {{ osprofiler_backend_connection_string }}
{% if enable_barbican | bool %} {% if enable_barbican | bool %}
[barbican] [barbican]
auth_endpoint = {{ keystone_internal_url }} auth_endpoint = {{ keystone_internal_url }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
{% if nova_compute_virt_type == "xenapi" %} {% if nova_compute_virt_type == "xenapi" %}

6
ansible/roles/nova-hyperv/templates/nova_hyperv.conf.j2
View File

@ -29,11 +29,11 @@ password = {{ placement_keystone_password }}
project_domain_name = {{ default_project_domain_name }} project_domain_name = {{ default_project_domain_name }}
user_domain_name = {{ default_user_domain_name }} user_domain_name = {{ default_user_domain_name }}
os_region_name = {{ openstack_region_name }} os_region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[glance] [glance]
api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }} api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[hyperv] [hyperv]
@ -59,7 +59,7 @@ username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
auth_url = {{ keystone_admin_url }}/v3 auth_url = {{ keystone_admin_url }}/v3
auth_type = v3password auth_type = v3password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[oslo_messaging_notifications] [oslo_messaging_notifications]
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}

12
ansible/roles/nova/templates/nova.conf.j2
View File

@ -59,7 +59,7 @@ lock_path = /var/lib/nova/tmp
[glance] [glance]
api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }} api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
num_retries = {{ groups['glance-api'] | length }} num_retries = {{ groups['glance-api'] | length }}
debug = {{ nova_logging_debug }} debug = {{ nova_logging_debug }}
@ -74,7 +74,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ cinder_keystone_user }} username = {{ cinder_keystone_user }}
password = {{ cinder_keystone_password }} password = {{ cinder_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}
[neutron] [neutron]
@ -92,7 +92,7 @@ username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
valid_interfaces = internal valid_interfaces = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[database] [database]
connection = mysql+pymysql://{{ nova_cell0_database_user }}:{{ nova_cell0_database_password }}@{{ nova_cell0_database_address }}/{{ nova_cell0_database_name }} connection = mysql+pymysql://{{ nova_cell0_database_user }}:{{ nova_cell0_database_password }}@{{ nova_cell0_database_address }}/{{ nova_cell0_database_name }}
@ -119,7 +119,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ nova_keystone_user }} username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }} password = {{ nova_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -170,7 +170,7 @@ user_domain_name = {{ default_user_domain_name }}
project_name = service project_name = service
project_domain_name = {{ default_project_domain_name }} project_domain_name = {{ default_project_domain_name }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
valid_interfaces = internal valid_interfaces = internal
[notifications] [notifications]
@ -195,5 +195,5 @@ connection_string = {{ osprofiler_backend_connection_string }}
{% if enable_barbican | bool %} {% if enable_barbican | bool %}
[barbican] [barbican]
auth_endpoint = {{ keystone_internal_url }} auth_endpoint = {{ keystone_internal_url }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% endif %} {% endif %}

8
ansible/roles/octavia/templates/octavia.conf.j2
View File

@ -44,7 +44,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ octavia_keystone_user }} username = {{ octavia_keystone_user }}
password = {{ octavia_keystone_password }} password = {{ octavia_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -84,14 +84,14 @@ policy_file = {{ octavia_policy_file }}
[glance] [glance]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internal endpoint_type = internal
ca_certificates_file == {{ openstack_cacert | default(omit) }} ca_certificates_file == {{ openstack_cacert }}
[neutron] [neutron]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internal endpoint_type = internal
ca_certificates_file == {{ openstack_cacert | default(omit) }} ca_certificates_file == {{ openstack_cacert }}
[nova] [nova]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internal endpoint_type = internal
ca_certificates_file == {{ openstack_cacert | default(omit) }} ca_certificates_file == {{ openstack_cacert }}

2
ansible/roles/panko/templates/panko.conf.j2
View File

@ -25,7 +25,7 @@ username = {{ panko_keystone_user }}
password = {{ panko_keystone_password }} password = {{ panko_keystone_password }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/placement/templates/placement.conf.j2
View File

@ -42,7 +42,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ placement_keystone_user }} username = {{ placement_keystone_user }}
password = {{ placement_keystone_password }} password = {{ placement_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/qinling/templates/qinling.conf.j2
View File

@ -28,7 +28,7 @@ project_name = service
username = {{ qinling_keystone_user }} username = {{ qinling_keystone_user }}
password = {{ qinling_keystone_password }} password = {{ qinling_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

4
ansible/roles/sahara/templates/sahara.conf.j2
View File

@ -21,7 +21,7 @@ project_name = service
project_domain_name = {{ default_project_domain_name }} project_domain_name = {{ default_project_domain_name }}
username = {{ sahara_keystone_user }} username = {{ sahara_keystone_user }}
password = {{ sahara_keystone_password }} password = {{ sahara_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -52,4 +52,4 @@ user_domain_name = {{ default_user_domain_name }}
username = {{ sahara_keystone_user }} username = {{ sahara_keystone_user }}
password = {{ sahara_keystone_password }} password = {{ sahara_keystone_password }}
auth_url = {{ keystone_admin_url }}/v3 auth_url = {{ keystone_admin_url }}/v3
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}

4
ansible/roles/searchlight/templates/searchlight.conf.j2
View File

@ -29,7 +29,7 @@ user_domain_name = {{ default_user_domain_name }}
username = {{ searchlight_keystone_user }} username = {{ searchlight_keystone_user }}
password = {{ searchlight_keystone_password }} password = {{ searchlight_keystone_password }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -61,7 +61,7 @@ username = {{ searchlight_keystone_user }}
password = {{ searchlight_keystone_password }} password = {{ searchlight_keystone_password }}
auth_type = password auth_type = password
auth_plugin = password auth_plugin = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/senlin/templates/senlin.conf.j2
View File

@ -49,7 +49,7 @@ project_name = service
username = {{ senlin_keystone_user }} username = {{ senlin_keystone_user }}
password = {{ senlin_keystone_password }} password = {{ senlin_keystone_password }}
service_token_roles_required = False service_token_roles_required = False
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/solum/templates/solum.conf.j2
View File

@ -51,7 +51,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ solum_keystone_user }} username = {{ solum_keystone_user }}
password = {{ solum_keystone_password }} password = {{ solum_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/swift/templates/proxy-server.conf.j2
View File

@ -44,7 +44,7 @@ project_name = service
username = {{ swift_keystone_user }} username = {{ swift_keystone_user }}
password = {{ swift_keystone_password }} password = {{ swift_keystone_password }}
delay_auth_decision = {{ swift_delay_auth_decision }} delay_auth_decision = {{ swift_delay_auth_decision }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/tacker/templates/tacker.conf.j2
View File

@ -38,7 +38,7 @@ user_domain_name = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ tacker_keystone_user }} username = {{ tacker_keystone_user }}
password = {{ tacker_keystone_password }} password = {{ tacker_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

2
ansible/roles/telegraf/templates/telegraf.conf.j2
View File

@ -19,7 +19,7 @@
retention_policy = "autogen" retention_policy = "autogen"
write_consistency = "any" write_consistency = "any"
timeout = "5s" timeout = "5s"
tls_ca = {{ openstack_cacert | default(omit) }} tls_ca = {{ openstack_cacert }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
[[inputs.cpu]] [[inputs.cpu]]

2
ansible/roles/tempest/templates/tempest.conf.j2
View File

@ -41,7 +41,7 @@ region = {{ openstack_region_name }}
auth_version = v3 auth_version = v3
uri = {{ keystone_admin_url }}/v2.0 uri = {{ keystone_admin_url }}/v2.0
uri_v3 = {{ keystone_admin_url }}/v3 uri_v3 = {{ keystone_admin_url }}/v3
ca_certificates_file = {{ openstack_cacert | default(omit) }} ca_certificates_file = {{ openstack_cacert }}
[image] [image]
region = {{ openstack_region_name }} region = {{ openstack_region_name }}

2
ansible/roles/trove/templates/trove.conf.j2
View File

@ -39,7 +39,7 @@ username = {{ trove_keystone_user }}
password = {{ trove_keystone_password }} password = {{ trove_keystone_password }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[oslo_messaging_notifications] [oslo_messaging_notifications]
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}

4
ansible/roles/vitrage/templates/vitrage.conf.j2
View File

@ -39,7 +39,7 @@ project_name = service
username = {{ vitrage_keystone_user }} username = {{ vitrage_keystone_user }}
password = {{ vitrage_keystone_password }} password = {{ vitrage_keystone_password }}
service_token_roles_required = True service_token_roles_required = True
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -55,7 +55,7 @@ project_name = admin
password = {{ vitrage_keystone_password }} password = {{ vitrage_keystone_password }}
username = {{ vitrage_keystone_user }} username = {{ vitrage_keystone_user }}
interface = internal interface = internal
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}

4
ansible/roles/watcher/templates/watcher.conf.j2
View File

@ -26,7 +26,7 @@ project_name = service
username = {{ watcher_keystone_user }} username = {{ watcher_keystone_user }}
password = {{ watcher_keystone_password }} password = {{ watcher_keystone_password }}
service_token_roles_required = True service_token_roles_required = True
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -41,7 +41,7 @@ user_domain_id = {{ default_user_domain_id }}
project_name = service project_name = service
username = {{ watcher_keystone_user }} username = {{ watcher_keystone_user }}
password = {{ watcher_keystone_password }} password = {{ watcher_keystone_password }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
[oslo_concurrency] [oslo_concurrency]
lock_path = /var/lib/watcher/tmp lock_path = /var/lib/watcher/tmp

4
ansible/roles/zun/templates/zun.conf.j2
View File

@ -38,7 +38,7 @@ username = {{ zun_keystone_user }}
password = {{ zun_keystone_password }} password = {{ zun_keystone_password }}
service_token_roles_required = True service_token_roles_required = True
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% if enable_memcached | bool %} {% if enable_memcached | bool %}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
@ -60,7 +60,7 @@ username = {{ zun_keystone_user }}
password = {{ zun_keystone_password }} password = {{ zun_keystone_password }}
service_token_roles_required = True service_token_roles_required = True
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
cafile = {{ openstack_cacert | default(omit) }} cafile = {{ openstack_cacert }}
{% if enable_memcached | bool %} {% if enable_memcached | bool %}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT