Merge lp:~james-page/charms/trusty/nova-cloud-controller/kilo into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[James Page]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2883 nova-cloud-controller-next for james-page mp254051
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2883/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2674 nova-cloud-controller-next for james-page mp254051
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2674/

[lp:~james-page/charms/trusty/nova-cloud-controller/kilo]

150. By James Page on 2015-03-25

resync helpers

151. By James Page on 2015-03-25

Switch to using charm-helper templates for rabbitmq

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2681 nova-cloud-controller-next for james-page mp254051
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10676223/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2681/

[lp:~james-page/charms/trusty/nova-cloud-controller/kilo]

152. By James Page on 2015-03-25

Switch to using charm-helper templates for keystone authtoken

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2890 nova-cloud-controller-next for james-page mp254051
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2890/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2681 nova-cloud-controller-next for james-page mp254051
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2681/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2688 nova-cloud-controller-next for james-page mp254051
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10676441/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2688/

[lp:~james-page/charms/trusty/nova-cloud-controller/kilo]

153. By James Page on 2015-03-25

Don't overwrite all endpoints

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2898 nova-cloud-controller-next for james-page mp254051
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2898/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2689 nova-cloud-controller-next for james-page mp254051
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2689/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2696 nova-cloud-controller-next for james-page mp254051
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10678139/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2696/

[Liam Young (gnuoy)]

I have deployed with this branch and none of the nova services picked up the rabbit setting. Moving the rabbit config back into the default section fixed the issue.

From the nova-conductor.log:

2015-03-27 14:58:37.658 1451 ERROR oslo.messaging._drivers.impl_rabbit [req-13d19830-2316-4c52-833d-3d349ff28f07 ] AMQP server on 127.0.0.1:5672 is unreachable: [Errno 111] ECONNREFUSED. Trying again in 2 seconds.
2015-03-27 14:58:37.660 1450 ERROR oslo.messaging._drivers.impl_rabbit [req-a29fd275-7814-44c4-b2a9-251493ccca14 ] AMQP server on 127.0.0.1:5672 is unreachable: [Errno 111] ECONNREFUSED. Trying again in 2 seconds.

review: Needs Fixing

[Liam Young (gnuoy)]

Earlier issue was due to the version of kilo being installed. Deployment completed successfully using after switching to vivid and ppa:james-page/kilo

review: Approve

=== added file 'hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken'
--- hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken	2015-03-25 13:34:36 +0000
@@ -0,0 +1,9 @@
+{% if auth_host -%}
+[keystone_authtoken]
+identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/{{ auth_admin_prefix }}
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/{{ service_admin_prefix }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+signing_dir = {{ signing_dir }}
+{% endif -%}

=== added file 'hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo'
--- hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo	2015-03-25 13:34:36 +0000
@@ -0,0 +1,22 @@
+{% if rabbitmq_host or rabbitmq_hosts -%}
+[oslo_messaging_rabbit]
+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 -%}

=== modified file 'hooks/charmhelpers/core/services/helpers.py'
--- hooks/charmhelpers/core/services/helpers.py	2015-03-04 09:51:39 +0000
+++ hooks/charmhelpers/core/services/helpers.py	2015-03-25 13:34:36 +0000
@@ -139,7 +139,7 @@
 
     def __init__(self, *args, **kwargs):
         self.required_keys = ['host', 'user', 'password', 'database']
-        super(HttpRelation).__init__(self, *args, **kwargs)
+        RelationContext.__init__(self, *args, **kwargs)
 
 
 class HttpRelation(RelationContext):
@@ -154,7 +154,7 @@
 
     def __init__(self, *args, **kwargs):
         self.required_keys = ['host', 'port']
-        super(HttpRelation).__init__(self, *args, **kwargs)
+        RelationContext.__init__(self, *args, **kwargs)
 
     def provide_data(self):
         return {

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2015-02-19 19:51:58 +0000
+++ hooks/nova_cc_utils.py	2015-03-25 13:34:36 +0000
@@ -846,6 +846,23 @@
             'quantum_internal_url': neutron_internal_url,
         })
 
+    if os_rel >= 'kilo':
+        # NOTE(jamespage) drop endpoints for ec2 and s3
+        #  ec2 is deprecated
+        #  s3 is insecure and should die in flames
+        endpoints.update({
+            'ec2_service': None,
+            'ec2_region': None,
+            'ec2_public_url': None,
+            'ec2_admin_url': None,
+            'ec2_internal_url': None,
+            's3_service': None,
+            's3_region': None,
+            's3_public_url': None,
+            's3_admin_url': None,
+            's3_internal_url': None,
+        })
+
     return endpoints
 
 

=== added file 'templates/kilo/etc_nova_api-paste.ini'
--- templates/kilo/etc_nova_api-paste.ini	1970-01-01 00:00:00 +0000
+++ templates/kilo/etc_nova_api-paste.ini	2015-03-25 13:34:36 +0000
@@ -0,0 +1,147 @@
+############
+# Metadata #
+############
+[composite:metadata]
+use = egg:Paste#urlmap
+/: meta
+
+[pipeline:meta]
+pipeline = ec2faultwrap logrequest metaapp
+
+[app:metaapp]
+paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
+
+#######
+# EC2 #
+#######
+
+[composite:ec2]
+use = egg:Paste#urlmap
+/: ec2cloud
+
+[composite:ec2cloud]
+use = call:nova.api.auth:pipeline_factory
+noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
+noauth2 = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
+keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor
+
+[filter:ec2faultwrap]
+paste.filter_factory = nova.api.ec2:FaultWrapper.factory
+
+[filter:logrequest]
+paste.filter_factory = nova.api.ec2:RequestLogging.factory
+
+[filter:ec2lockout]
+paste.filter_factory = nova.api.ec2:Lockout.factory
+
+[filter:ec2keystoneauth]
+paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory
+
+[filter:ec2noauth]
+paste.filter_factory = nova.api.ec2:NoAuth.factory
+
+[filter:cloudrequest]
+controller = nova.api.ec2.cloud.CloudController
+paste.filter_factory = nova.api.ec2:Requestify.factory
+
+[filter:authorizer]
+paste.filter_factory = nova.api.ec2:Authorizer.factory
+
+[filter:validator]
+paste.filter_factory = nova.api.ec2:Validator.factory
+
+[app:ec2executor]
+paste.app_factory = nova.api.ec2:Executor.factory
+
+#############
+# OpenStack #
+#############
+
+[composite:osapi_compute]
+use = call:nova.api.openstack.urlmap:urlmap_factory
+/: oscomputeversions
+/v1.1: openstack_compute_api_v2
+/v2: openstack_compute_api_v2
+/v2.1: openstack_compute_api_v21
+/v3: openstack_compute_api_v3
+
+[composite:openstack_compute_api_v2]
+use = call:nova.api.auth:pipeline_factory
+noauth = compute_req_id faultwrap sizelimit noauth ratelimit osapi_compute_app_v2
+noauth2 = compute_req_id faultwrap sizelimit noauth2 ratelimit osapi_compute_app_v2
+keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext ratelimit osapi_compute_app_v2
+keystone_nolimit = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v2
+
+[composite:openstack_compute_api_v21]
+use = call:nova.api.auth:pipeline_factory_v21
+noauth = compute_req_id faultwrap sizelimit noauth osapi_compute_app_v21
+noauth2 = compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21
+keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v21
+
+[composite:openstack_compute_api_v3]
+use = call:nova.api.auth:pipeline_factory_v21
+noauth = request_id faultwrap sizelimit noauth_v3 osapi_compute_app_v3
+noauth2 = request_id faultwrap sizelimit noauth_v3 osapi_compute_app_v3
+keystone = request_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v3
+
+[filter:request_id]
+paste.filter_factory = oslo.middleware:RequestId.factory
+
+[filter:compute_req_id]
+paste.filter_factory = nova.api.compute_req_id:ComputeReqIdMiddleware.factory
+
+[filter:faultwrap]
+paste.filter_factory = nova.api.openstack:FaultWrapper.factory
+
+[filter:noauth]
+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareOld.factory
+
+[filter:noauth2]
+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
+
+[filter:noauth_v3]
+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareV3.factory
+
+[filter:ratelimit]
+paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
+
+[filter:sizelimit]
+paste.filter_factory = oslo.middleware:RequestBodySizeLimiter.factory
+
+[app:osapi_compute_app_v2]
+paste.app_factory = nova.api.openstack.compute:APIRouter.factory
+
+[app:osapi_compute_app_v21]
+paste.app_factory = nova.api.openstack.compute:APIRouterV21.factory
+
+[app:osapi_compute_app_v3]
+paste.app_factory = nova.api.openstack.compute:APIRouterV3.factory
+
+[pipeline:oscomputeversions]
+pipeline = faultwrap oscomputeversionapp
+
+[app:oscomputeversionapp]
+paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
+
+##########
+# Shared #
+##########
+
+[filter:keystonecontext]
+paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
+
+[filter:authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
+
+{% if service_host -%}
+# NOTE(jamespage) - not used - but required for relation to nova-compute
+service_protocol = {{ service_protocol }}
+service_host = {{ service_host }}
+service_port = {{ service_port }}
+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 }}
+{% endif -%}

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-02-20 10:21:52 +0000
+++ templates/kilo/nova.conf	2015-03-25 13:34:36 +0000
@@ -10,7 +10,6 @@
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
 state_path=/var/lib/nova
-lock_path=/var/lock/nova
 force_dhcp_release=True
 iscsi_helper=tgtadm
 libvirt_use_virtio_for_bridges=True
@@ -46,8 +45,6 @@
 keystone_ec2_url = {{ keystone_ec2_url }}
 {% endif -%}
 
-{% include "parts/rabbitmq" %}
-
 {% if rbd_pool -%}
 rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
@@ -131,17 +128,7 @@
 {% endif -%}
 {% endif -%}
 
-{% if auth_host -%}
-[keystone_authtoken]
-auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
-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 -%}
+{% include "section-keystone-authtoken" %}
 
 [osapi_v3]
 enabled=True
@@ -150,3 +137,8 @@
 
 [conductor]
 workers = {{ workers }}
+
+{% include "section-rabbitmq-oslo" %}
+
+[oslo_concurrency]
+lock_path=/var/lock/nova