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

[James Page]

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

89. By James Page on 2015-03-25

resync helpers

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

charm_lint_check #2893 swift-proxy-next for james-page mp254054
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/swift_context.py:145:51: E127 continuation line over-indented for visual indent
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10676328/
Build: http://10.245.162.77:8080/job/charm_lint_check/2893/

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

charm_unit_test #2684 swift-proxy-next for james-page mp254054
    UNIT OK: passed

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

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

charm_amulet_test #2691 swift-proxy-next for james-page mp254054
    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/10676461/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2691/

[Liam Young (gnuoy)]

Approve

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:23:00 +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:23:00 +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:54:42 +0000
+++ hooks/charmhelpers/core/services/helpers.py	2015-03-25 09:23:00 +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/swift_context.py'
--- hooks/swift_context.py	2015-03-13 13:02:08 +0000
+++ hooks/swift_context.py	2015-03-25 09:23:00 +0000
@@ -141,6 +141,8 @@
                                                      unit, relid) or 'http',
                     'keystone_host': relation_get('auth_host',
                                                   unit, relid),
+                    'service_host': relation_get('service_host',
+                                                  unit, relid),
                     'auth_port': relation_get('auth_port',
                                               unit, relid),
                     'service_user': relation_get('service_username',

=== added directory 'templates/kilo'
=== added file 'templates/kilo/proxy-server.conf'
--- templates/kilo/proxy-server.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/proxy-server.conf	2015-03-25 09:23:00 +0000
@@ -0,0 +1,93 @@
+[DEFAULT]
+bind_port = {{ bind_port }}
+workers = {{ workers }}
+user = swift
+bind_ip = {{ bind_host }}
+{% if ssl %}
+cert_file = {{ ssl_cert }}
+key_file = {{ ssl_key }}
+{% endif %}
+
+{% if auth_type == 'keystone' %}
+[pipeline:main]
+pipeline = gatekeeper healthcheck cache swift3 s3token container_sync bulk tempurl slo dlo formpost authtoken keystoneauth staticweb container-quotas account-quotas proxy-server
+{% else %}
+[pipeline:main]
+pipeline = gatekeeper healthcheck cache container_sync bulk tempurl slo dlo formpost tempauth staticweb container-quotas account-quotas proxy-server
+{% endif %}
+
+[app:proxy-server]
+use = egg:swift#proxy
+allow_account_management = true
+{% if auth_type == 'keystone' %}account_autocreate = true{% endif %}
+node_timeout = {{ node_timeout }}
+recoverable_node_timeout = {{ recoverable_node_timeout }}
+
+[filter:tempauth]
+use = egg:swift#tempauth
+user_system_root = testpass .admin https://{{ proxy_ip }}:8080/v1/AUTH_system
+
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
+[filter:cache]
+use = egg:swift#memcache
+memcache_servers = {{ memcached_ip }}:11211
+
+[filter:account-quotas]
+use = egg:swift#account_quotas
+
+[filter:container-quotas]
+use = egg:swift#container_quotas
+
+[filter:staticweb]
+use = egg:swift#staticweb
+
+[filter:bulk]
+use = egg:swift#bulk
+
+[filter:slo]
+use = egg:swift#slo
+
+[filter:dlo]
+use = egg:swift#dlo
+
+[filter:formpost]
+use = egg:swift#formpost
+
+[filter:tempurl]
+use = egg:swift#tempurl
+
+[filter:container_sync]
+use = egg:swift#container_sync
+
+[filter:gatekeeper]
+use = egg:swift#gatekeeper
+
+{% if auth_type == 'keystone' %}
+[filter:keystoneauth]
+use = egg:swift#keystoneauth
+operator_roles = {{ operator_roles }}
+
+[filter:authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
+identity_uri = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
+admin_tenant_name = {{ service_tenant }}
+admin_user = {{ service_user }}
+admin_password = {{ service_password }}
+delay_auth_decision = {{ delay_auth_decision|lower }}
+signing_dir = {{ signing_dir }}
+cache = swift.cache
+
+[filter:s3token]
+paste.filter_factory = keystonemiddleware.s3_token:filter_factory
+identity_uri = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
+admin_tenant_name = {{ service_tenant }}
+admin_user = {{ service_user }}
+admin_password = {{ service_password }}
+
+[filter:swift3]
+use = egg:swift3#swift3
+{% endif %}