Merge "Messaging multi-backend support"
This commit is contained in:
commit
6ca5fbf7c5
|
@ -4,7 +4,6 @@ use_syslog = False
|
|||
use_stderr = True
|
||||
use_forwarded_for = True
|
||||
region_name_for_services = RegionOne
|
||||
rpc_backend = rabbit
|
||||
rpc_response_timeout=600
|
||||
stack_domain_admin = {{ heat.domain.user }}
|
||||
stack_domain_admin_password = {{ heat.domain.password }}
|
||||
|
@ -13,19 +12,12 @@ heat_waitcondition_server_url = {{ address('heat-api-cfn', heat.api_cfn_port, ex
|
|||
heat_metadata_server_url = {{ address('heat-api-cfn', heat.api_cfn_port, external=True, with_scheme=True) }}
|
||||
reauthentication_auth_method = trusts
|
||||
|
||||
|
||||
[clients]
|
||||
endpoint_type = internalURL
|
||||
|
||||
[database]
|
||||
connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address(service.database) }}/{{ heat.db.name }}
|
||||
|
||||
[oslo_messaging_rabbit]
|
||||
rabbit_userid = {{ rabbitmq.user }}
|
||||
rabbit_password = {{ rabbitmq.password }}
|
||||
rabbit_ha_queues = true
|
||||
rabbit_hosts = rabbitmq
|
||||
|
||||
[keystone_authtoken]
|
||||
auth_version = v3
|
||||
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
|
||||
|
@ -60,8 +52,11 @@ bind_port = {{ heat.api_port.cont }}
|
|||
bind_host = {{ network_topology["private"]["address"] }}
|
||||
bind_port = {{ heat.api_cfn_port.cont }}
|
||||
|
||||
|
||||
[cache]
|
||||
backend = oslo_cache.memcache_pool
|
||||
enabled = True
|
||||
memcache_servers = {{ address('memcached', memcached.port) }}
|
||||
|
||||
{# messaging macros template #}
|
||||
{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
|
||||
{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
|
||||
|
|
|
@ -33,7 +33,7 @@ service:
|
|||
openstack endpoint create --region RegionOne cloudformation admin {{ address('heat-api-cfn', heat.api_cfn_port, with_scheme=True) }}/v1
|
||||
daemon:
|
||||
dependencies:
|
||||
- rabbitmq
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
# heat-api in dependencies, because it prepares DB, which will be used
|
||||
- heat-api
|
||||
files:
|
||||
|
|
|
@ -91,7 +91,7 @@ service:
|
|||
- grant-doman-user-admin-privileges
|
||||
daemon:
|
||||
dependencies:
|
||||
- rabbitmq
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
files:
|
||||
- heat-conf
|
||||
command: heat-api --config-file /etc/heat/heat.conf
|
||||
|
|
|
@ -8,7 +8,8 @@ service:
|
|||
command: heat-engine --config-file /etc/heat/heat.conf
|
||||
dependencies:
|
||||
- heat-api
|
||||
- rabbitmq
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
files:
|
||||
- heat.conf
|
||||
files:
|
||||
|
|
Loading…
Reference in New Issue