Merge "Update openstack config files to support rabbitmq cluster"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
bbc2ae852c
|
|
@ -1,11 +1,18 @@
|
|||
[DEFAULT]
|
||||
|
||||
{{#rabbit}}
|
||||
rabbit_host={{host}}
|
||||
rabbit_password={{password}}
|
||||
rpc_backend=ceilometer.openstack.common.rpc.impl_kombu
|
||||
{{#rabbit.nodes}}
|
||||
rabbit_hosts={{rabbit.nodes}}
|
||||
rabbit_ha_queues=true
|
||||
{{/rabbit.nodes}}
|
||||
{{^rabbit.nodes}}
|
||||
rabbit_host={{host}}
|
||||
{{/rabbit.nodes}}
|
||||
{{/rabbit}}
|
||||
|
||||
|
||||
{{#qpid}}
|
||||
qpid_hostname={{host}}
|
||||
qpid_username={{username}}
|
||||
|
|
|
|||
|
|
@ -27,9 +27,14 @@ sql_connection={{cinder.db}}
|
|||
|
||||
{{#rabbit}}
|
||||
rpc_backend=cinder.openstack.common.rpc.impl_kombu
|
||||
rabbit_host = {{host}}
|
||||
rabbit_port = 5672
|
||||
rabbit_password = {{password}}
|
||||
{{#rabbit.nodes}}
|
||||
rabbit_hosts={{rabbit.nodes}}
|
||||
rabbit_ha_queues=true
|
||||
{{/rabbit.nodes}}
|
||||
{{^rabbit.nodes}}
|
||||
rabbit_host = {{host}}
|
||||
{{/rabbit.nodes}}
|
||||
{{/rabbit}}
|
||||
|
||||
{{#qpid}}
|
||||
|
|
@ -54,4 +59,4 @@ admin_tenant_name = service
|
|||
admin_user = cinder
|
||||
admin_password = {{cinder.service-password}}
|
||||
auth_uri = http://{{keystone.host}}:5000/v2.0
|
||||
auth_protocol = http
|
||||
auth_protocol = http
|
||||
|
|
|
|||
|
|
@ -43,15 +43,19 @@ registry_host = 0.0.0.0
|
|||
registry_port = 9191
|
||||
|
||||
{{#rabbit}}
|
||||
rabbit_host = {{host}}
|
||||
rabbit_port = 5672
|
||||
rabbit_use_ssl = false
|
||||
rabbit_userid = guest
|
||||
rabbit_password = {{password}}
|
||||
rabbit_virtual_host = /
|
||||
rabbit_notification_exchange = glance
|
||||
rabbit_notification_topic = notifications
|
||||
rabbit_durable_queues = False
|
||||
{{#rabbit.nodes}}
|
||||
rabbit_hosts={{rabbit.nodes}}
|
||||
rabbit_ha_queues=true
|
||||
{{/rabbit.nodes}}
|
||||
{{^rabbit.nodes}}
|
||||
rabbit_host = {{host}}
|
||||
{{/rabbit.nodes}}
|
||||
{{/rabbit}}
|
||||
|
||||
{{#qpid}}
|
||||
|
|
|
|||
|
|
@ -310,66 +310,15 @@ auth_encryption_key = {{heat.auth_encryption_key}}
|
|||
#amqp_auto_delete=false
|
||||
|
||||
{{#rabbit}}
|
||||
#
|
||||
# Options defined in heat.openstack.common.rpc.impl_kombu
|
||||
#
|
||||
rabbit_password={{password}}
|
||||
rpc_backend=heat.openstack.common.rpc.impl_kombu
|
||||
|
||||
# SSL version to use (valid only if SSL enabled). valid values
|
||||
# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some
|
||||
# distributions (string value)
|
||||
#kombu_ssl_version=
|
||||
|
||||
# SSL key file (valid only if SSL enabled) (string value)
|
||||
#kombu_ssl_keyfile=
|
||||
|
||||
# SSL cert file (valid only if SSL enabled) (string value)
|
||||
#kombu_ssl_certfile=
|
||||
|
||||
# SSL certification authority file (valid only if SSL enabled)
|
||||
# (string value)
|
||||
#kombu_ssl_ca_certs=
|
||||
|
||||
# The RabbitMQ broker address where a single node is used
|
||||
# (string value)
|
||||
rabbit_host = {{host}}
|
||||
|
||||
# The RabbitMQ broker port where a single node is used
|
||||
# (integer value)
|
||||
#rabbit_port=5672
|
||||
|
||||
# RabbitMQ HA cluster host:port pairs (list value)
|
||||
#rabbit_hosts=$rabbit_host:$rabbit_port
|
||||
|
||||
# connect over SSL for RabbitMQ (boolean value)
|
||||
#rabbit_use_ssl=false
|
||||
|
||||
# the RabbitMQ userid (string value)
|
||||
#rabbit_userid=guest
|
||||
|
||||
# the RabbitMQ password (string value)
|
||||
rabbit_password = {{password}}
|
||||
|
||||
# the RabbitMQ virtual host (string value)
|
||||
#rabbit_virtual_host=/
|
||||
|
||||
# how frequently to retry connecting with RabbitMQ (integer
|
||||
# value)
|
||||
#rabbit_retry_interval=1
|
||||
|
||||
# how long to backoff for between retries when connecting to
|
||||
# RabbitMQ (integer value)
|
||||
#rabbit_retry_backoff=2
|
||||
|
||||
# maximum retries with trying to connect to RabbitMQ (the
|
||||
# default of 0 implies an infinite retry count) (integer
|
||||
# value)
|
||||
#rabbit_max_retries=0
|
||||
|
||||
# use H/A queues in RabbitMQ (x-ha-policy: all).You need to
|
||||
# wipe RabbitMQ database when changing this option. (boolean
|
||||
# value)
|
||||
#rabbit_ha_queues=false
|
||||
{{#rabbit.nodes}}
|
||||
rabbit_hosts={{rabbit.nodes}}
|
||||
rabbit_ha_queues=true
|
||||
{{/rabbit.nodes}}
|
||||
{{^rabbit.nodes}}
|
||||
rabbit_host={{host}}
|
||||
{{/rabbit.nodes}}
|
||||
{{/rabbit}}
|
||||
|
||||
{{#qpid}}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,15 @@
|
|||
[DEFAULT]
|
||||
rabbit_host={{rabbit.host}}
|
||||
rabbit_port=5672
|
||||
{{#rabbit}}
|
||||
rabbit_userid=guest
|
||||
rabbit_password={{rabbit.password}}
|
||||
rabbit_password={{password}}
|
||||
{{#rabbit.nodes}}
|
||||
rabbit_hosts={{rabbit.nodes}}
|
||||
rabbit_ha_queues=true
|
||||
{{/rabbit.nodes}}
|
||||
{{^rabbit.nodes}}
|
||||
rabbit_host = {{host}}
|
||||
{{/rabbit.nodes}}
|
||||
{{/rabbit}}
|
||||
|
||||
default_log_levels='amqplib=WARN, sqlalchemy=WARN, keystone=WARN, eventlet.wsgi.server=WARN'
|
||||
policy_file=/etc/ironic/policy.json
|
||||
|
|
|
|||
|
|
@ -25,10 +25,17 @@ core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
|
|||
service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin
|
||||
|
||||
{{#rabbit}}
|
||||
rabbit_host = {{host}}
|
||||
rabbit_password = {{password}}
|
||||
rpc_backend = neutron.openstack.common.rpc.impl_kombu
|
||||
rabbit_password={{password}}
|
||||
{{#rabbit.nodes}}
|
||||
rabbit_hosts={{rabbit.nodes}}
|
||||
rabbit_ha_queues=true
|
||||
{{/rabbit.nodes}}
|
||||
{{^rabbit.nodes}}
|
||||
rabbit_host={{host}}
|
||||
{{/rabbit.nodes}}
|
||||
{{/rabbit}}
|
||||
|
||||
{{#qpid}}
|
||||
qpid_hostname = {{host}}
|
||||
qpid_username = {{username}}
|
||||
|
|
|
|||
|
|
@ -76,9 +76,15 @@ firewall_driver=nova.virt.firewall.NoopFirewallDriver
|
|||
volume_api_class=nova.volume.cinder.API
|
||||
|
||||
{{#rabbit}}
|
||||
rabbit_host={{host}}
|
||||
rabbit_password={{password}}
|
||||
rpc_backend=nova.openstack.common.rpc.impl_kombu
|
||||
{{#rabbit.nodes}}
|
||||
rabbit_hosts={{rabbit.nodes}}
|
||||
rabbit_ha_queues=true
|
||||
{{/rabbit.nodes}}
|
||||
{{^rabbit.nodes}}
|
||||
rabbit_host={{host}}
|
||||
{{/rabbit.nodes}}
|
||||
{{/rabbit}}
|
||||
|
||||
{{#qpid}}
|
||||
|
|
|
|||
Loading…
Reference in New Issue