openstack/kolla-ansible
Code Issues Proposed changes

Remove unused configuration items from tacker role

Browse Source 
New tacker has removed nova heat configure items,
but the tacker role is still using it.

In addition, the ceilometer and aodh are backend OpenStack
components, the configuration of feature in tacker does not depend
on them directly.

Change-Id: I475ff763475ed699a1e7498cc9898bd71d00ae7c
Closes-bug: 1718113
This commit is contained in:
yong sheng gong 2017-09-19 07:08:26 +00:00 committed by Jeffrey Zhang
parent f455674245
commit 8c4862cf35
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,27 +9,13 @@ bind_port = {{ tacker_server_port }}
api_workers = {{ openstack_service_workers }}
service_plugins = nfvo,vnfm
{% if enable_nova | bool %}
nova_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}
nova_admin_user_name = nova
nova_admin_password = {{ nova_keystone_password }}
nova_admin_tenant_id = service
nova_admin_auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
[tacker_nova]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_type = password
project_domain_name = {{ default_project_domain_id }}
user_domain_name = {{ default_user_domain_id }}
project_name = service
username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }}
{% endif %}
[nfvo]
vim_drivers = openstack
[openstack_vim]
stack_retries = 60
stack_retry_wait = 10
{% if enable_barbican | bool %}
[vim_keys]
use_barbican = True
@ -37,9 +23,7 @@ use_barbican = True
[tacker]
monitor_driver = ping,http_ping
{% if enable_ceilometer | bool %}
alarm_monitor_driver = ceilometer
{% endif %}
[database]
connection = mysql+pymysql://{{ tacker_database_user }}:{{ tacker_database_password }}@{{ tacker_database_address }}/{{ tacker_database_name }}
@ -59,24 +43,16 @@ memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
{% if enable_aodh | bool %}
[alarm_auth]
username = {{ tacker_keystone_user }}
password = {{ tacker_keystone_password }}
project_name = service
url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %}
{% if enable_ceilometer | bool %}
[ceilometer]
host = {{ api_interface_address }}
port = {{ tacker_server_port }}
{% endif %}
{% if enable_heat | bool %}
[tacker_heat]
heat_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ heat_api_port }}/v1
{% endif %}
[oslo_messaging_notifications]
{% if enable_ceilometer | bool %}