Skip to content
Snippets Groups Projects
Commit 01ff25f4 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Remove some deprecated config options"

parents 32ceccbd e127627d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/glance/templates/glance-api.conf.j2
+ 0
− 2
View file @ 01ff25f4
...@@ -9,8 +9,6 @@ bind_host = {{ api_interface_address }} ...@@ -9,8 +9,6 @@ bind_host = {{ api_interface_address }}
bind_port = {{ glance_api_listen_port }} bind_port = {{ glance_api_listen_port }}
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
registry_host = {{ glance_internal_fqdn }}
{% if glance_backend_ceph | bool %} {% if glance_backend_ceph | bool %}
show_multiple_locations = True show_multiple_locations = True
{% endif %} {% endif %}
......
ansible/roles/heat/templates/heat.conf.j2
+ 0
− 2
View file @ 01ff25f4
...@@ -12,8 +12,6 @@ stack_domain_admin = heat_domain_admin ...@@ -12,8 +12,6 @@ stack_domain_admin = heat_domain_admin
stack_domain_admin_password = {{ heat_domain_admin_password }} stack_domain_admin_password = {{ heat_domain_admin_password }}
stack_user_domain_name = heat_user_domain stack_user_domain_name = heat_user_domain
deferred_auth_method = trusts
{% if service_name == 'heat-engine' %} {% if service_name == 'heat-engine' %}
num_engine_workers = {{ openstack_service_workers }} num_engine_workers = {{ openstack_service_workers }}
{% endif %} {% endif %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment