openstack
/
kolla
Code Issues Proposed changes

Merge "Use driver instead of deprecated notification_driver in config"

This commit is contained in:
Jenkins 2016-01-19 15:33:26 +00:00 committed by Gerrit Code Review
parent 4cfeeed021 66f5802daa
commit 4216a507be
7 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@ debug = true
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind_port = {{ glance_api_port }} bind_port = {{ glance_api_port }}
notification_driver = noop
registry_host = {{ kolla_internal_address }} registry_host = {{ kolla_internal_address }}
@ -42,3 +41,6 @@ rbd_store_chunk_size = 8
default_store = file default_store = file
filesystem_store_datadir = /var/lib/glance/images/ filesystem_store_datadir = /var/lib/glance/images/
{% endif %} {% endif %}
[oslo_messaging_notifications]
driver = noop

4
ansible/roles/glance/templates/glance-registry.conf.j2
View File

@ -4,7 +4,6 @@ debug = true
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind_port = {{ glance_registry_port }} bind_port = {{ glance_registry_port }}
notification_driver = noop
use_syslog = True use_syslog = True
syslog_log_facility = LOG_LOCAL0 syslog_log_facility = LOG_LOCAL0
@ -24,3 +23,6 @@ password = {{ glance_keystone_password }}
[paste_deploy] [paste_deploy]
flavor = keystone flavor = keystone
[oslo_messaging_notifications]
driver = noop

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

@ -8,7 +8,6 @@ stack_domain_admin_password = {{ heat_domain_admin_password }}
stack_user_domain_name = heat_user_domain stack_user_domain_name = heat_user_domain
rpc_backend = rabbit rpc_backend = rabbit
notification_driver = noop
deferred_auth_method = password deferred_auth_method = password
syslog_log_facility=LOG_LOCAL0 syslog_log_facility=LOG_LOCAL0
@ -50,3 +49,6 @@ auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
[clients_keystone] [clients_keystone]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
[oslo_messaging_notifications]
driver = noop

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

@ -1,7 +1,6 @@
[DEFAULT] [DEFAULT]
debug = {{ openstack_logging_debug }} debug = {{ openstack_logging_debug }}
notification_driver = noop
use_syslog = True use_syslog = True
syslog_log_facility = LOG_LOCAL0 syslog_log_facility = LOG_LOCAL0
@ -32,3 +31,6 @@ rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }} rabbit_password = {{ rabbitmq_password }}
rabbit_ha_queues = true rabbit_ha_queues = true
rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
[oslo_messaging_notifications]
driver = noop

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

@ -1,7 +1,6 @@
[DEFAULT] [DEFAULT]
debug = {{ openstack_logging_debug }} debug = {{ openstack_logging_debug }}
notification_driver = noop
use_syslog = True use_syslog = True
syslog_log_facility = LOG_LOCAL0 syslog_log_facility = LOG_LOCAL0
@ -32,3 +31,6 @@ rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }} rabbit_password = {{ rabbitmq_password }}
rabbit_ha_queues = true rabbit_ha_queues = true
rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
[oslo_messaging_notifications]
driver = noop

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

@ -11,7 +11,6 @@ bind_port = {{ neutron_server_port }}
#lock_path = /var/lock/neutron #lock_path = /var/lock/neutron
api_paste_config = /usr/share/neutron/api-paste.ini api_paste_config = /usr/share/neutron/api-paste.ini
notification_driver = noop
{% if neutron_plugin_agent == "openvswitch" %} {% if neutron_plugin_agent == "openvswitch" %}
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
@ -62,3 +61,6 @@ user_domain_id = default
project_name = service project_name = service
username = neutron username = neutron
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
[oslo_messaging_notifications]
driver = noop

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

@ -17,7 +17,6 @@ metadata_listen_port = {{ nova_metadata_port }}
ec2_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} ec2_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
ec2_listen_port = {{ nova_api_ec2_port }} ec2_listen_port = {{ nova_api_ec2_port }}
notification_driver = noop
security_group_api = neutron security_group_api = neutron
network_api_class = nova.network.neutronv2.api.API network_api_class = nova.network.neutronv2.api.API
@ -151,3 +150,6 @@ hw_disk_discard = unmap
[upgrade_levels] [upgrade_levels]
compute = auto compute = auto
[oslo_messaging_notifications]
driver = noop