[beisner,r=corey.bryant] Add kilo heat.conf template.
This commit is contained in:
commit
4fc30dc3f2
@ -46,15 +46,22 @@ class OpenStackAmuletDeployment(AmuletDeployment):
|
|||||||
stable or next branches for the other_services."""
|
stable or next branches for the other_services."""
|
||||||
base_charms = ['mysql', 'mongodb']
|
base_charms = ['mysql', 'mongodb']
|
||||||
|
|
||||||
|
if self.series in ['precise', 'trusty']:
|
||||||
|
base_series = self.series
|
||||||
|
else:
|
||||||
|
base_series = self.current_next
|
||||||
|
|
||||||
if self.stable:
|
if self.stable:
|
||||||
for svc in other_services:
|
for svc in other_services:
|
||||||
temp = 'lp:charms/{}'
|
temp = 'lp:charms/{}/{}'
|
||||||
svc['location'] = temp.format(svc['name'])
|
svc['location'] = temp.format(base_series,
|
||||||
|
svc['name'])
|
||||||
else:
|
else:
|
||||||
for svc in other_services:
|
for svc in other_services:
|
||||||
if svc['name'] in base_charms:
|
if svc['name'] in base_charms:
|
||||||
temp = 'lp:charms/{}'
|
temp = 'lp:charms/{}/{}'
|
||||||
svc['location'] = temp.format(svc['name'])
|
svc['location'] = temp.format(base_series,
|
||||||
|
svc['name'])
|
||||||
else:
|
else:
|
||||||
temp = 'lp:~openstack-charmers/charms/{}/{}/next'
|
temp = 'lp:~openstack-charmers/charms/{}/{}/next'
|
||||||
svc['location'] = temp.format(self.current_next,
|
svc['location'] = temp.format(self.current_next,
|
||||||
@ -99,10 +106,12 @@ class OpenStackAmuletDeployment(AmuletDeployment):
|
|||||||
Return an integer representing the enum value of the openstack
|
Return an integer representing the enum value of the openstack
|
||||||
release.
|
release.
|
||||||
"""
|
"""
|
||||||
|
# Must be ordered by OpenStack release (not by Ubuntu release):
|
||||||
(self.precise_essex, self.precise_folsom, self.precise_grizzly,
|
(self.precise_essex, self.precise_folsom, self.precise_grizzly,
|
||||||
self.precise_havana, self.precise_icehouse,
|
self.precise_havana, self.precise_icehouse,
|
||||||
self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
|
self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
|
||||||
self.utopic_juno, self.vivid_kilo) = range(10)
|
self.trusty_kilo, self.vivid_kilo) = range(10)
|
||||||
|
|
||||||
releases = {
|
releases = {
|
||||||
('precise', None): self.precise_essex,
|
('precise', None): self.precise_essex,
|
||||||
('precise', 'cloud:precise-folsom'): self.precise_folsom,
|
('precise', 'cloud:precise-folsom'): self.precise_folsom,
|
||||||
|
78
templates/kilo/heat.conf
Normal file
78
templates/kilo/heat.conf
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
use_syslog = {{ use_syslog }}
|
||||||
|
debug = False
|
||||||
|
verbose = False
|
||||||
|
log_dir = /var/log/heat
|
||||||
|
instance_user=ec2-user
|
||||||
|
instance_driver=heat.engine.nova
|
||||||
|
plugin_dirs=/usr/lib64/heat,/usr/lib/heat
|
||||||
|
environment_dir=/etc/heat/environment.d
|
||||||
|
deferred_auth_method=password
|
||||||
|
host=heat
|
||||||
|
auth_encryption_key={{ encryption_key }}
|
||||||
|
|
||||||
|
{% if database_host -%}
|
||||||
|
# < Icehouse db config
|
||||||
|
sql_connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if rabbitmq_host or rabbitmq_hosts -%}
|
||||||
|
rabbit_userid = {{ rabbitmq_user }}
|
||||||
|
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
|
||||||
|
rabbit_password = {{ rabbitmq_password }}
|
||||||
|
{% if rabbitmq_hosts -%}
|
||||||
|
rabbit_hosts = {{ rabbitmq_hosts }}
|
||||||
|
{% if rabbitmq_ha_queues -%}
|
||||||
|
rabbit_ha_queues = True
|
||||||
|
rabbit_durable_queues = False
|
||||||
|
{% endif -%}
|
||||||
|
{% else -%}
|
||||||
|
rabbit_host = {{ rabbitmq_host }}
|
||||||
|
{% endif -%}
|
||||||
|
{% if rabbit_ssl_port -%}
|
||||||
|
rabbit_use_ssl = True
|
||||||
|
rabbit_port = {{ rabbit_ssl_port }}
|
||||||
|
{% if rabbit_ssl_ca -%}
|
||||||
|
kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
|
||||||
|
{% endif -%}
|
||||||
|
{% endif -%}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if auth_host -%}
|
||||||
|
[keystone_authtoken]
|
||||||
|
identity_uri = {{ service_protocol }}://{{ service_host }}:{{ auth_port }}
|
||||||
|
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
|
||||||
|
auth_host = {{ auth_host }}
|
||||||
|
auth_port = {{ auth_port }}
|
||||||
|
auth_protocol = {{ auth_protocol }}
|
||||||
|
admin_tenant_name = {{ admin_tenant_name }}
|
||||||
|
admin_user = {{ admin_user }}
|
||||||
|
admin_password = {{ admin_password }}
|
||||||
|
signing_dir = {{ signing_dir }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
[ec2_authtoken]
|
||||||
|
auth_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
|
||||||
|
keystone_ec2_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/ec2tokens
|
||||||
|
|
||||||
|
{% if database_host -%}
|
||||||
|
[database]
|
||||||
|
connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
|
||||||
|
{% endif -%}
|
||||||
|
|
||||||
|
[paste_deploy]
|
||||||
|
api_paste_config=/etc/heat/api-paste.ini
|
||||||
|
|
||||||
|
[heat_api]
|
||||||
|
{% if api_listen_port -%}
|
||||||
|
bind_port={{ api_listen_port }}
|
||||||
|
{% else -%}
|
||||||
|
bind_port=8004
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
[heat_api_cfn]
|
||||||
|
{% if api_cfn_listen_port -%}
|
||||||
|
bind_port={{ api_cfn_listen_port }}
|
||||||
|
{% else -%}
|
||||||
|
bind_port=8000
|
||||||
|
{% endif %}
|
Loading…
Reference in New Issue
Block a user