openstack/openstack-ansible
Code Issues Proposed changes

Merge "Tidy up notification_driver implementation across projects"

Browse Source
This commit is contained in:
Jenkins 2015-12-05 06:01:25 +00:00 committed by Gerrit Code Review
commit e142145b0e
7 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/os_cinder/templates/cinder.conf.j2
View File

@ -94,7 +94,7 @@ enabled_backends={% for backend in cinder_backends|dictsort %}{{ backend.0 }}{%
#cinder configurations
{% if cinder_ceilometer_enabled %}
notification_driver = cinder.openstack.common.notifier.rpc_notifier
notification_driver = messagingv2
{% endif %}
# All given backend(s)

2
playbooks/roles/os_glance/defaults/main.yml
View File

@ -53,8 +53,6 @@ glance_system_comment: glance system user
glance_system_user_home: "/var/lib/{{ glance_system_user_name }}"
glance_registry_host: "{{ internal_lb_vip_address }}"
glance_ceilometer_notification_driver: messagingv2
glance_notification_driver: noop
glance_rpc_backend: glance.openstack.common.rpc.impl_kombu
glance_default_store: file
glance_flavor: "{% if glance_default_store == 'rbd' %}keystone{% else %}keystone+cachemanagement{% endif %}"

8
playbooks/roles/os_glance/templates/glance-api.conf.j2
View File

@ -29,14 +29,10 @@ enable_v2_registry = {{ glance_enable_v2_registry }}
#
{% if glance_ceilometer_enabled %}
notification_driver = {{ glance_ceilometer_notification_driver }}
{% else %}
notification_driver = {{ glance_notification_driver }}
{% endif %}
{% if glance_notification_driver == "messaging" or (glance_ceilometer_notification_driver == "messagingv2" and glance_ceilometer_enabled) %}
rpc_backend = {{ glance_rpc_backend }}
notification_driver = messagingv2
{% endif %}
rpc_backend = {{ glance_rpc_backend }}
delayed_delete = False
scrub_time = 43200

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

@ -16,9 +16,9 @@ workers = {{ glance_registry_workers | default(api_threads) }}
api_limit_max = 1000
limit_param_default = 25
{% if glance_ceilometer_enabled %}
notification_driver = {{ glance_notification_driver }}
rpc_backend = {{ glance_rpc_backend }}
notification_driver = messagingv2
{% endif %}
rpc_backend = {{ glance_rpc_backend }}
[database]
connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8

2
playbooks/roles/os_heat/templates/heat.conf.j2
View File

@ -33,7 +33,7 @@ plugin_dirs = {{ heat_plugin_dirs | join(',') }}
# Ceilometer options
{% if heat_ceilometer_enabled %}
notification_driver = heat.openstack.common.notifier.rpc_notifier
notification_driver = messagingv2
{% endif %}

1
playbooks/roles/os_neutron/defaults/main.yml
View File

@ -168,7 +168,6 @@ neutron_driver_loadbalancer_pool_scheduler: neutron_lbaas.services.loadbalancer.
neutron_driver_interface: neutron.agent.linux.interface.BridgeInterfaceDriver
neutron_driver_metering: neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver
neutron_driver_dhcp: neutron.agent.linux.dhcp.Dnsmasq
neutron_driver_notification: messagingv2
neutron_driver_quota: neutron.db.quota.driver.DbQuotaDriver
neutron_driver_firewall: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver

3
playbooks/roles/os_neutron/templates/neutron.conf.j2
View File

@ -39,6 +39,9 @@ auth_strategy = keystone
network_scheduler_driver = {{ neutron_driver_network_scheduler }}
router_scheduler_driver = {{ neutron_driver_router_scheduler }}
loadbalancer_pool_scheduler_driver = {{ neutron_driver_loadbalancer_pool_scheduler }}
{% if neutron_ceilometer_enabled %}
notification_driver = messagingv2
{% endif %}
# Schedulers
network_auto_schedule = True