Merge lp:~heut2008/charms/trusty/glance/user-config-flags into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Yaguang Tang]

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

UOSCI bot says:
charm_lint_check #1013 glance-next for heut2008 mp241654
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/glance_utils.py:89:27: E122 continuation line missing indentation or outdented
  hooks/glance_utils.py:90:27: E122 continuation line missing indentation or outdented
  hooks/glance_utils.py:107:27: E122 continuation line missing indentation or outdented
  hooks/glance_utils.py:108:27: E122 continuation line missing indentation or outdented
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/8979954/
Build: http://10.98.191.181:8080/job/charm_lint_check/1013/

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

UOSCI bot says:
charm_unit_test #847 glance-next for heut2008 mp241654
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/glance_relations 211 9 96% 289-290, 309-320
  hooks/glance_utils 91 8 91% 162, 255-267
  TOTAL 350 23 93%
  Ran 65 tests in 3.379s
  OK

Full unit test output: http://paste.ubuntu.com/8979956/
Build: http://10.98.191.181:8080/job/charm_unit_test/847/

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

UOSCI bot says:
charm_amulet_test #392 glance-next for heut2008 mp241654
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/8980286/
Build: http://10.98.191.181:8080/job/charm_amulet_test/392/

[Edward Hope-Morley (hopem)]

$ make lint
Running flake8 tests:
hooks/glance_utils.py:89:27: E122 continuation line missing indentation or outdented
hooks/glance_utils.py:90:27: E122 continuation line missing indentation or outdented
hooks/glance_utils.py:107:27: E122 continuation line missing indentation or outdented
hooks/glance_utils.py:108:27: E122 continuation line missing indentation or outdented
make: *** [lint] Error 1

Yaguang, please please please run tests before putting code up for review. Aside from the error this looks fine.

=== modified file 'config.yaml'
--- config.yaml	2014-10-08 10:40:04 +0000
+++ config.yaml	2014-11-13 05:42:17 +0000
@@ -22,6 +22,18 @@
     default: glance
     type: string
     description: Glance database name.
+  api-config-flags:
+    type: string
+    description: |
+      Comma-separated list of key=value pairs to be added to glance-api.conf
+      where 'value' may itself be a comma-separated list of values to be
+      assigned to the 'key'.
+  registry-config-flags:
+    type: string
+    description: |
+      Comma-separated list of key=value pairs to be added to glance-registry.conf
+      where 'value' may itself be a comma-separated list of values to be
+      assigned to the 'key'.
   region:
     default: RegionOne
     type: string

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2014-10-07 19:33:10 +0000
+++ hooks/glance_utils.py	2014-11-13 05:42:17 +0000
@@ -84,7 +84,10 @@
                           context.SyslogContext(),
                           glance_contexts.LoggingConfigContext(),
                           glance_contexts.GlanceIPv6Context(),
-                          context.WorkerConfigContext()],
+                          context.WorkerConfigContext(),
+                          context.OSConfigFlagContext(
+                          charm_flag='registry-config-flags',
+                          template_flag='registry_config_flags')],
         'services': ['glance-registry']
     }),
     (GLANCE_API_CONF, {
@@ -99,7 +102,10 @@
                           glance_contexts.LoggingConfigContext(),
                           glance_contexts.GlanceIPv6Context(),
                           context.WorkerConfigContext(),
-                          glance_contexts.MultiStoreContext()],
+                          glance_contexts.MultiStoreContext(),
+                          context.OSConfigFlagContext(
+                          charm_flag='api-config-flags',
+                          template_flag='api_config_flags')],
         'services': ['glance-api']
     }),
     (GLANCE_API_PASTE_INI, {

=== modified file 'templates/icehouse/glance-api.conf'
--- templates/icehouse/glance-api.conf	2014-10-24 09:36:46 +0000
+++ templates/icehouse/glance-api.conf	2014-11-13 05:42:17 +0000
@@ -30,6 +30,12 @@
 registry_port = 9191
 registry_client_protocol = http
 
+{% if api_config_flags -%} 
+{% for key, value in api_config_flags.iteritems() -%} 
+{{ key }} = {{ value }}
+{% endfor -%} 
+{% endif -%} 
+
 {% include "parts/rabbitmq" %}
 
 {% if rabbitmq_host or rabbitmq_hosts -%}

=== modified file 'templates/icehouse/glance-registry.conf'
--- templates/icehouse/glance-registry.conf	2014-10-07 12:28:20 +0000
+++ templates/icehouse/glance-registry.conf	2014-11-13 05:42:17 +0000
@@ -12,5 +12,11 @@
 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 "parts/keystone" %}
 {% include "parts/section-database" %}

=== modified file 'templates/juno/glance-api.conf'
--- templates/juno/glance-api.conf	2014-10-24 09:42:04 +0000
+++ templates/juno/glance-api.conf	2014-11-13 05:42:17 +0000
@@ -33,6 +33,12 @@
 registry_port = 9191
 registry_client_protocol = http
 
+{% if api_config_flags -%} 
+{% for key, value in api_config_flags.iteritems() -%} 
+{{ key }} = {{ value }}
+{% endfor -%} 
+{% endif -%}
+
 {% include "parts/rabbitmq" %}
 
 {% if rabbitmq_host or rabbitmq_hosts -%}