Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/mitaka-api-fix into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

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

charm_lint_check #17394 nova-cloud-controller-next for gnuoy mp282762
    LINT OK: passed

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

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

charm_unit_test #16251 nova-cloud-controller-next for gnuoy mp282762
    UNIT OK: passed

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

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

charm_amulet_test #8804 nova-cloud-controller-next for gnuoy mp282762
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

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

charm_amulet_test #8808 nova-cloud-controller-next for gnuoy mp282762
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

[lp:~gnuoy/charms/trusty/nova-cloud-controller/mitaka-api-fix]

214. By Liam Young on 2016-01-20

Update api-paste.ini from https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/nova/tree/etc/nova/api-paste.ini

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

charm_lint_check #17792 nova-cloud-controller-next for gnuoy mp282762
    LINT OK: passed

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

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

charm_unit_test #16628 nova-cloud-controller-next for gnuoy mp282762
    UNIT OK: passed

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

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

charm_lint_check #17794 nova-cloud-controller-next for gnuoy mp282762
    LINT OK: passed

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

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

charm_unit_test #16629 nova-cloud-controller-next for gnuoy mp282762
    UNIT OK: passed

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

[David Ames (thedac)]

This looks good. Waiting on amulet test +1

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

charm_amulet_test #8922 nova-cloud-controller-next for gnuoy mp282762
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8922/

=== added directory 'templates/mitaka'
=== added file 'templates/mitaka/api-paste.ini'
--- templates/mitaka/api-paste.ini	1970-01-01 00:00:00 +0000
+++ templates/mitaka/api-paste.ini	2016-01-20 11:54:36 +0000
@@ -0,0 +1,160 @@
+############
+# Metadata #
+############
+[composite:metadata]
+use = egg:Paste#urlmap
+/: meta
+
+[pipeline:meta]
+pipeline = cors ec2faultwrap logrequest metaapp
+
+[app:metaapp]
+paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
+
+#######
+# EC2 #
+#######
+
+# NOTE: this is now deprecated in favor of https://github.com/stackforge/ec2-api
+[composite:ec2]
+use = egg:Paste#urlmap
+/: ec2cloud
+
+[composite:ec2cloud]
+use = call:nova.api.auth:pipeline_factory
+noauth2 = cors ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
+keystone = cors 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
+# starting in Liberty the v21 implementation replaces the v2
+# implementation and is suggested that you use it as the default. If
+# this causes issues with your clients you can rollback to the
+# *frozen* v2 api by commenting out the above stanza and using the
+# following instead::
+# /v1.1: openstack_compute_api_legacy_v2
+# /v2: openstack_compute_api_legacy_v2
+# if rolling back to v2 fixes your issue please file a critical bug
+# at - https://bugs.launchpad.net/nova/+bugs
+#
+# v21 is an exactly feature match for v2, except it has more stringent
+# input validation on the wsgi surface (prevents fuzzing early on the
+# API). It also provides new features via API microversions which are
+# opt into for clients. Unaware clients will receive the same frozen
+# v2 API feature set, but with some relaxed validation
+/v1.1: openstack_compute_api_v21_legacy_v2_compatible
+/v2: openstack_compute_api_v21_legacy_v2_compatible
+/v2.1: openstack_compute_api_v21
+
+# NOTE: this is deprecated in favor of openstack_compute_api_v21_legacy_v2_compatible
+[composite:openstack_compute_api_legacy_v2]
+use = call:nova.api.auth:pipeline_factory
+noauth2 = cors compute_req_id faultwrap sizelimit noauth2 legacy_ratelimit osapi_compute_app_legacy_v2
+keystone = cors compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_ratelimit osapi_compute_app_legacy_v2
+keystone_nolimit = cors compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_legacy_v2
+
+[composite:openstack_compute_api_v21]
+use = call:nova.api.auth:pipeline_factory_v21
+noauth2 = cors compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21
+keystone = cors compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v21
+
+[composite:openstack_compute_api_v21_legacy_v2_compatible]
+use = call:nova.api.auth:pipeline_factory_v21
+noauth2 = cors compute_req_id faultwrap sizelimit noauth2 legacy_v2_compatible osapi_compute_app_v21
+keystone = cors compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_v2_compatible osapi_compute_app_v21
+
+[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:noauth2]
+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
+
+[filter:legacy_ratelimit]
+paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
+{% if api_rate_limit_rules -%}
+limits = {{ api_rate_limit_rules }}
+{% endif -%}
+
+[filter:sizelimit]
+paste.filter_factory = oslo_middleware:RequestBodySizeLimiter.factory
+
+[filter:legacy_v2_compatible]
+paste.filter_factory = nova.api.openstack:LegacyV2CompatibleWrapper.factory
+
+[app:osapi_compute_app_legacy_v2]
+paste.app_factory = nova.api.openstack.compute:APIRouter.factory
+
+[app:osapi_compute_app_v21]
+paste.app_factory = nova.api.openstack.compute:APIRouterV21.factory
+
+[pipeline:oscomputeversions]
+pipeline = faultwrap oscomputeversionapp
+
+[app:oscomputeversionapp]
+paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
+
+##########
+# Shared #
+##########
+
+[filter:cors]
+paste.filter_factory = oslo_middleware.cors:filter_factory
+oslo_config_project = nova
+
+[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 -%}