From 72ae2e9dfe54d61826048c4e35388c6d61072478 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 22 Apr 2015 16:27:02 +0000 Subject: [PATCH 1/6] heat_utils - add packages to resolve kilo issues in https://bugs.launchpad.net/cloud-archive/+bug/1446507 --- hooks/heat_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hooks/heat_utils.py b/hooks/heat_utils.py index 651d936..001df69 100644 --- a/hooks/heat_utils.py +++ b/hooks/heat_utils.py @@ -38,6 +38,8 @@ TEMPLATES = 'templates/' BASE_PACKAGES = [ 'python-keystoneclient', 'python-six', + 'python-testscenarios', # bug 1446507 + 'python-testresources', # bug 1446507 'uuid', 'apache2', 'haproxy', From cee39160717d8e124272f4291a69d9e53fd2f8e4 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 22 Apr 2015 16:28:16 +0000 Subject: [PATCH 2/6] templates - add heat.conf tempate for kilo, identity_uri required --- templates/kilo/heat.conf | 78 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 templates/kilo/heat.conf diff --git a/templates/kilo/heat.conf b/templates/kilo/heat.conf new file mode 100644 index 0000000..045751e --- /dev/null +++ b/templates/kilo/heat.conf @@ -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 }}:{{ service_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 %} From b0e6bdd6d438592e8e6e0e4717b1abaa471ede07 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 22 Apr 2015 16:28:47 +0000 Subject: [PATCH 3/6] sync charmhelpers --- .../contrib/openstack/amulet/deployment.py | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py index 11d49a7..461a702 100644 --- a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py @@ -46,15 +46,22 @@ class OpenStackAmuletDeployment(AmuletDeployment): stable or next branches for the other_services.""" base_charms = ['mysql', 'mongodb'] + if self.series in ['precise', 'trusty']: + base_series = self.series + else: + base_series = self.current_next + if self.stable: for svc in other_services: - temp = 'lp:charms/{}' - svc['location'] = temp.format(svc['name']) + temp = 'lp:charms/{}/{}' + svc['location'] = temp.format(base_series, + svc['name']) else: for svc in other_services: if svc['name'] in base_charms: - temp = 'lp:charms/{}' - svc['location'] = temp.format(svc['name']) + temp = 'lp:charms/{}/{}' + svc['location'] = temp.format(base_series, + svc['name']) else: temp = 'lp:~openstack-charmers/charms/{}/{}/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 release. """ + # Must be ordered by OpenStack release (not by Ubuntu release): (self.precise_essex, self.precise_folsom, self.precise_grizzly, self.precise_havana, self.precise_icehouse, - self.trusty_icehouse, self.trusty_juno, self.trusty_kilo, - self.utopic_juno, self.vivid_kilo) = range(10) + self.trusty_icehouse, self.trusty_juno, self.utopic_juno, + self.trusty_kilo, self.vivid_kilo) = range(10) + releases = { ('precise', None): self.precise_essex, ('precise', 'cloud:precise-folsom'): self.precise_folsom, From 1e29ecfb3e45360c82034138fcd59a8c4fd7d4da Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 22 Apr 2015 16:31:57 +0000 Subject: [PATCH 4/6] cleanup --- hooks/heat_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/heat_utils.py b/hooks/heat_utils.py index 001df69..1f264f8 100644 --- a/hooks/heat_utils.py +++ b/hooks/heat_utils.py @@ -38,8 +38,8 @@ TEMPLATES = 'templates/' BASE_PACKAGES = [ 'python-keystoneclient', 'python-six', - 'python-testscenarios', # bug 1446507 'python-testresources', # bug 1446507 + 'python-testscenarios', # bug 1446507 'uuid', 'apache2', 'haproxy', From 7a4217933c4b33b038497cc9b7e4b75d686c58f9 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 22 Apr 2015 16:34:01 +0000 Subject: [PATCH 5/6] fix auth port in kilo/heat.conf for identity_uri --- templates/kilo/heat.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/kilo/heat.conf b/templates/kilo/heat.conf index 045751e..2cbc62f 100644 --- a/templates/kilo/heat.conf +++ b/templates/kilo/heat.conf @@ -40,7 +40,7 @@ kombu_ssl_ca_certs = {{ rabbit_ssl_ca }} {% if auth_host -%} [keystone_authtoken] -identity_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }} +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 }} From d77827543808742551278aaa5df9008a67297993 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 22 Apr 2015 17:01:59 +0000 Subject: [PATCH 6/6] heat_utils - revert package list change, as bug 1446507 will be addressed in packaging --- hooks/heat_utils.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/hooks/heat_utils.py b/hooks/heat_utils.py index 1f264f8..651d936 100644 --- a/hooks/heat_utils.py +++ b/hooks/heat_utils.py @@ -38,8 +38,6 @@ TEMPLATES = 'templates/' BASE_PACKAGES = [ 'python-keystoneclient', 'python-six', - 'python-testresources', # bug 1446507 - 'python-testscenarios', # bug 1446507 'uuid', 'apache2', 'haproxy',