Merge lp:~hopem/charms/trusty/keystone/service-admin-prefix-option into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Edward Hope-Morley]

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

UOSCI bot says:
charm_lint_check #1317 keystone-next for hopem mp243528
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value

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

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

UOSCI bot says:
charm_unit_test #1151 keystone-next for hopem mp243528
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/keystone_ssl 158 132 16% 106-128, 132-146, 150-158, 162-172, 176-177, 182-193, 197-206, 210-221, 225-237, 243-256, 259-266, 269-279, 282-296, 299-302
  hooks/keystone_utils 393 204 48% 204, 218, 242-247, 290-299, 306-321, 328-336, 341-351, 358-384, 389-398, 403-417, 422-444, 449-466, 480-503, 512-517, 522, 529-539, 544-552, 557-562, 566-573, 581-586, 597-612, 616-624, 649-650, 681, 738, 741, 744, 793-806, 830-834, 838-850
  TOTAL 803 392 51%
  Ran 38 tests in 3.123s
  OK

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

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

UOSCI bot says:
charm_amulet_test #583 keystone-next for hopem mp243528
    AMULET OK: passed

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

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

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

UOSCI bot says:
charm_lint_check #99 keystone-next for hopem mp243528
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_lint_check/99/

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

UOSCI bot says:
charm_unit_test #99 keystone-next for hopem mp243528
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/keystone_ssl 158 132 16% 106-128, 132-146, 150-158, 162-172, 176-177, 182-193, 197-206, 210-221, 225-237, 243-256, 259-266, 269-279, 282-296, 299-302
  hooks/keystone_utils 393 204 48% 204, 218, 242-247, 290-299, 306-321, 328-336, 341-351, 358-384, 389-398, 403-417, 422-444, 449-466, 480-503, 512-517, 522, 529-539, 544-552, 557-562, 566-573, 581-586, 597-612, 616-624, 649-650, 681, 738, 741, 744, 793-806, 830-834, 838-850
  TOTAL 803 392 51%
  Ran 38 tests in 3.518s
  OK

Full unit test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_unit_test/99/

[James Page (james-page)]

review: Needs Fixing

[lp:~hopem/charms/trusty/keystone/service-admin-prefix-option]

91. By Edward Hope-Morley on 2014-12-12

fix default value

[James Page (james-page)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-10-07 12:29:11 +0000
+++ config.yaml	2014-12-12 10:41:26 +0000
@@ -70,6 +70,14 @@
     default: "services"
     type: string
     description: "Name of tenant to associate service credentials."
+  service-admin-prefix:
+    type: string
+    default: 
+    description: |
+      When service relations are joined they provide a name used to create a
+      service admin_username in keystone. The name used may be too crude for
+      some situations e.g. pre-populated LDAP identity backend. If set, this
+      option will be prepended to each service admin_username.
   # Database settings used to request access via shared-db-relation-* relations
   database:
     default: "keystone"

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2014-10-07 12:29:11 +0000
+++ hooks/keystone_utils.py	2014-12-12 10:41:26 +0000
@@ -672,7 +672,14 @@
                          publicurl=settings['public_url'],
                          adminurl=settings['admin_url'],
                          internalurl=settings['internal_url'])
+
+            # If an admin username prefix is provided, ensure all services use
+            # it.
             service_username = settings['service']
+            prefix = config('service-admin-prefix')
+            if prefix:
+                service_username = "%s%s" % (prefix, service_username)
+
             # NOTE(jamespage) internal IP for backwards compat for SSL certs
             internal_cn = urlparse.urlparse(settings['internal_url']).hostname
             https_cns.append(internal_cn)
@@ -725,6 +732,11 @@
                 https_cns.append(urlparse.urlparse(ep['admin_url']).hostname)
         service_username = '_'.join(services)
 
+        # If an admin username prefix is provided, ensure all services use it.
+        prefix = config('service-admin-prefix')
+        if prefix:
+            service_username = "%s%s" % (prefix, service_username)
+
     if 'None' in [v for k, v in settings.iteritems()]:
         return