openstack
/
salt-formula-heat
Code Issues Proposed changes

mitaka fixes based on fuel 9 

Change-Id: Ie174d80e0adc7d17cf330a756db40449f4ff3adc
This commit is contained in:
Jakub Pavlik 2016-11-09 13:56:14 +01:00
parent 68a3446014
commit 7a9cf4d594
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
heat/files/mitaka/heat.conf.Debian
View File

@ -180,6 +180,7 @@ notification_driver = oslo.messaging.notifier.Notifier
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
rpc_response_timeout = 600
# A URL representing the messaging driver to use and its full configuration. If
# not set, we fall back to the rpc_backend option and driver specific
@ -195,6 +196,10 @@ rpc_backend = rabbit
# exchange name specified in the transport_url option. (string value)
#control_exchange = openstack
max_resources_per_stack=20000
max_json_body_size=10880000
max_template_size=5440000
[heat_api]
#
@ -404,14 +409,26 @@ connection = {{ server.database.engine }}://{{ server.database.user }}:{{ server
[keystone_authtoken]
auth_type = password
auth_uri=http://{{ server.identity.host }}:5000/v3
auth_url=http://{{ server.identity.host }}:35357/v3
username = {{ server.identity.user }}
password = {{ server.identity.password }}
project_name = {{ server.identity.tenant }}
project_domain_name = default
user_domain_name = default
auth_uri=http://{{ server.identity.host }}:5000/v2.0
identity_uri=http://{{ server.identity.host }}:35357
admin_user={{ server.identity.user }}
admin_password={{ server.identity.password }}
admin_tenant_name={{ server.identity.tenant }}
# Commented based on Fuel 9.0 reference configs
#auth_url=http://{{ server.identity.host }}:35357/v3
#username = {{ server.identity.user }}
#password = {{ server.identity.password }}
#project_name = {{ server.identity.tenant }}
#project_domain_name = default
#user_domain_name = default
{%- if server.cache is defined %}
#memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
{%- if server.cache is defined %}
[cache]
enabled=True
backend=oslo_cache.memcache_pool
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
@ -421,6 +438,8 @@ auth_url = http://{{ server.identity.host }}:35357
username = {{ server.identity.user }}
password = {{ server.identity.password }}
user_domain_name = default
project_domain_id=Default
user_domain_id=Default
[matchmaker_redis]
@ -716,6 +735,9 @@ auth_uri=http://{{ server.identity.host }}:5000/v2.0
keystone_ec2_uri=http://{{ server.identity.host }}:5000/v2.0/ec2tokens
[clients_keystone]
auth_uri=http://{{ server.identity.host }}:35357
{%- if pillar.get('opencontrail', {}).get('client', {}).get('enabled', False) %}
{%- from "opencontrail/map.jinja" import client with context %}