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

[James Page]

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

charm_lint_check #2880 glance-next for james-page mp254048
    LINT OK: passed

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

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

charm_unit_test #2671 glance-next for james-page mp254048
    UNIT OK: passed

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

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

charm_amulet_test #2678 glance-next for james-page mp254048
    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/10676187/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2678/

[lp:~james-page/charms/trusty/glance/kilo]

104. By James Page on 2015-03-25

resync helpers

105. By James Page on 2015-03-25

Switch to using charm-helper templates for rabbitmq

106. 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 #2887 glance-next for james-page mp254048
    LINT OK: passed

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

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

charm_unit_test #2678 glance-next for james-page mp254048
    UNIT OK: passed

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

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

charm_amulet_test #2685 glance-next for james-page mp254048
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  juju-test INFO : Results: 1 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1

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

[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 09:25:43 +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 09:25:43 +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:50:53 +0000
+++ hooks/charmhelpers/core/services/helpers.py	2015-03-25 09:25:43 +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 {

=== added directory 'templates/kilo'
=== added file 'templates/kilo/glance-api-paste.ini'
--- templates/kilo/glance-api-paste.ini	1970-01-01 00:00:00 +0000
+++ templates/kilo/glance-api-paste.ini	2015-03-25 09:25:43 +0000
@@ -0,0 +1,77 @@
+# Use this pipeline for no auth or image caching - DEFAULT
+[pipeline:glance-api]
+pipeline = versionnegotiation osprofiler unauthenticated-context rootapp
+
+# Use this pipeline for image caching and no auth
+[pipeline:glance-api-caching]
+pipeline = versionnegotiation osprofiler unauthenticated-context cache rootapp
+
+# Use this pipeline for caching w/ management interface but no auth
+[pipeline:glance-api-cachemanagement]
+pipeline = versionnegotiation osprofiler unauthenticated-context cache cachemanage rootapp
+
+# Use this pipeline for keystone auth
+[pipeline:glance-api-keystone]
+pipeline = versionnegotiation osprofiler authtoken context  rootapp
+
+# Use this pipeline for keystone auth with image caching
+[pipeline:glance-api-keystone+caching]
+pipeline = versionnegotiation osprofiler authtoken context cache rootapp
+
+# Use this pipeline for keystone auth with caching and cache management
+[pipeline:glance-api-keystone+cachemanagement]
+pipeline = versionnegotiation osprofiler authtoken context cache cachemanage rootapp
+
+# Use this pipeline for authZ only. This means that the registry will treat a
+# user as authenticated without making requests to keystone to reauthenticate
+# the user.
+[pipeline:glance-api-trusted-auth]
+pipeline = versionnegotiation osprofiler context rootapp
+
+# Use this pipeline for authZ only. This means that the registry will treat a
+# user as authenticated without making requests to keystone to reauthenticate
+# the user and uses cache management
+[pipeline:glance-api-trusted-auth+cachemanagement]
+pipeline = versionnegotiation osprofiler context cache cachemanage rootapp
+
+[composite:rootapp]
+paste.composite_factory = glance.api:root_app_factory
+/: apiversions
+/v1: apiv1app
+/v2: apiv2app
+
+[app:apiversions]
+paste.app_factory = glance.api.versions:create_resource
+
+[app:apiv1app]
+paste.app_factory = glance.api.v1.router:API.factory
+
+[app:apiv2app]
+paste.app_factory = glance.api.v2.router:API.factory
+
+[filter:versionnegotiation]
+paste.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
+
+[filter:cache]
+paste.filter_factory = glance.api.middleware.cache:CacheFilter.factory
+
+[filter:cachemanage]
+paste.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter.factory
+
+[filter:context]
+paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
+
+[filter:unauthenticated-context]
+paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
+
+[filter:authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
+delay_auth_decision = true
+
+[filter:gzip]
+paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory
+
+[filter:osprofiler]
+paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
+hmac_keys = SECRET_KEY
+enabled = yes

=== added file 'templates/kilo/glance-api.conf'
--- templates/kilo/glance-api.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/glance-api.conf	2015-03-25 09:25:43 +0000
@@ -0,0 +1,83 @@
+[DEFAULT]
+verbose = {{ verbose }}
+use_syslog = {{ use_syslog }}
+debug = {{ debug }}
+workers = {{ workers }}
+
+known_stores = {{ known_stores }}
+{% if rbd_pool -%}
+default_store = rbd
+{% elif swift_store -%}
+default_store = swift
+{% else -%}
+default_store = file
+{% endif -%}
+
+bind_host = {{ bind_host }}
+
+{% if ext -%}
+bind_port = {{ ext }}
+{% elif bind_port -%}
+bind_port = {{ bind_port }}
+{% else -%}
+bind_port = 9292
+{% endif -%}
+
+log_file = /var/log/glance/api.log
+backlog = 4096
+
+registry_host = {{ registry_host }}
+registry_port = 9191
+registry_client_protocol = http
+
+{% if api_config_flags -%}
+{% for key, value in api_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if rabbitmq_host or rabbitmq_hosts -%}
+notification_driver = rabbit
+{% endif -%}
+
+{% if swift_store -%}
+swift_store_auth_version = 2
+swift_store_auth_address = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/
+swift_store_user = {{ admin_tenant_name }}:{{ admin_user }}
+swift_store_key = {{ admin_password }}
+swift_store_create_container_on_put = True
+swift_store_container = glance
+swift_store_large_object_size = 5120
+swift_store_large_object_chunk_size = 200
+swift_enable_snet = False
+{% endif -%}
+
+{% if rbd_pool -%}
+rbd_store_ceph_conf = /etc/ceph/ceph.conf
+rbd_store_user = {{ rbd_user }}
+rbd_store_pool = {{ rbd_pool }}
+rbd_store_chunk_size = 8
+{% endif -%}
+
+delayed_delete = False
+scrub_time = 43200
+scrubber_datadir = /var/lib/glance/scrubber
+image_cache_dir = /var/lib/glance/image-cache/
+db_enforce_mysql_charset = False
+
+[glance_store]
+filesystem_store_datadir = /var/lib/glance/images/
+
+[image_format]
+disk_formats=ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,root-tar
+
+{% include "section-keystone-authtoken" %}
+
+{% if auth_host -%}
+[paste_deploy]
+flavor = keystone
+{% endif %}
+
+{% include "parts/section-database" %}
+
+{% include "section-rabbitmq-oslo" %}

=== added file 'templates/kilo/glance-registry-paste.ini'
--- templates/kilo/glance-registry-paste.ini	1970-01-01 00:00:00 +0000
+++ templates/kilo/glance-registry-paste.ini	2015-03-25 09:25:43 +0000
@@ -0,0 +1,30 @@
+# Use this pipeline for no auth - DEFAULT
+[pipeline:glance-registry]
+pipeline = osprofiler unauthenticated-context registryapp
+
+# Use this pipeline for keystone auth
+[pipeline:glance-registry-keystone]
+pipeline = osprofiler authtoken context registryapp
+
+# Use this pipeline for authZ only. This means that the registry will treat a
+# user as authenticated without making requests to keystone to reauthenticate
+# the user.
+[pipeline:glance-registry-trusted-auth]
+pipeline = osprofiler context registryapp
+
+[app:registryapp]
+paste.app_factory = glance.registry.api:API.factory
+
+[filter:context]
+paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
+
+[filter:unauthenticated-context]
+paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
+
+[filter:authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
+
+[filter:osprofiler]
+paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
+hmac_keys = SECRET_KEY
+enabled = yes

=== added file 'templates/kilo/glance-registry.conf'
--- templates/kilo/glance-registry.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/glance-registry.conf	2015-03-25 09:25:43 +0000
@@ -0,0 +1,27 @@
+[DEFAULT]
+verbose = {{ verbose }}
+use_syslog = {{ use_syslog }}
+debug = {{ debug }}
+workers = {{ workers }}
+
+bind_host = {{ bind_host }}
+bind_port = 9191
+log_file = /var/log/glance/registry.log
+backlog = 4096
+api_limit_max = 1000
+limit_param_default = 25
+
+{% if registry_config_flags -%}
+{% for key, value in registry_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% include "section-keystone-authtoken" %}
+
+{% if auth_host -%}
+[paste_deploy]
+flavor = keystone
+{% endif %}
+
+{% include "parts/section-database" %}

=== modified file 'templates/parts/section-database'
--- templates/parts/section-database	2014-04-12 15:29:10 +0000
+++ templates/parts/section-database	2015-03-25 09:25:43 +0000
@@ -1,4 +1,5 @@
 {% 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 %}
+idle_timeout = 3600
 {% endif -%}