Merge lp:~1chb1n/charms/trusty/keystone/kilo-support into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Ryan Beisner]

Resolves Trusty-Kilo config-changed hook fail for https://bugs.launchpad.net/charms/+source/keystone/+bug/1417211.

Adds templates for kilo and fixes token section to point to the correct driver module: "driver = keystone.token.persistence.backends.sql.Token"

Pulled from matsubara's trunk MP, to test in OSCI overnight (thanks Diogo!).

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

charm_lint_check #1515 keystone-next for 1chb1n mp248456
    LINT OK: passed

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

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

charm_unit_test #1470 keystone-next for 1chb1n mp248456
    UNIT OK: passed

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

[Ryan Beisner (1chb1n)]

Manual deploy tests by Diogo on dellstack and by me on serverstack confirm general T:K happiness, though I want to wait for OSCI's full deployment tests to run to proceed on this.

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

charm_lint_check #1516 keystone-next for 1chb1n mp248456
    LINT OK: passed

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

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

charm_unit_test #1471 keystone-next for 1chb1n mp248456
    UNIT OK: passed

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

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

charm_amulet_test #1634 keystone-next for 1chb1n mp248456
    AMULET OK: passed

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

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

charm_amulet_test #1635 keystone-next for 1chb1n mp248456
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 124
  make: *** [test] Error 124

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

[Ryan Beisner (1chb1n)]

Safe to disregard amulet test #1635, undercloud bootstrapping issue.

[Diogo Matsubara (matsubara)]

It looks all right to me.

review: Approve

[Liam Young (gnuoy)]

Approve

review: Approve

=== added directory 'templates/kilo'
=== added file 'templates/kilo/keystone.conf'
--- templates/kilo/keystone.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/keystone.conf	2015-02-03 22:16:27 +0000
@@ -0,0 +1,105 @@
+# kilo
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+admin_token = {{ token }}
+admin_port = {{ admin_port }}
+public_port = {{ public_port }}
+use_syslog = {{ use_syslog }}
+log_config = /etc/keystone/logging.conf
+debug = {{ debug }}
+verbose = {{ verbose }}
+public_endpoint = {{ public_endpoint }}
+admin_endpoint = {{ admin_endpoint }}
+bind_host = {{ bind_host }}
+public_workers = {{ workers }}
+admin_workers = {{ workers }}
+
+[database]
+{% if database_host -%}
+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 %}
+{% else -%}
+connection = sqlite:////var/lib/keystone/keystone.db
+{% endif -%}
+idle_timeout = 200
+
+[identity]
+driver = keystone.identity.backends.{{ identity_backend }}.Identity
+
+[credential]
+driver = keystone.credential.backends.sql.Credential
+
+[trust]
+driver = keystone.trust.backends.sql.Trust
+
+[os_inherit]
+
+[catalog]
+driver = keystone.catalog.backends.sql.Catalog
+
+[endpoint_filter]
+
+[token]
+driver = keystone.token.persistence.backends.sql.Token
+provider = keystone.token.providers.uuid.Provider
+
+[cache]
+
+[policy]
+driver = keystone.policy.backends.sql.Policy
+
+[ec2]
+driver = keystone.contrib.ec2.backends.sql.Ec2
+
+[assignment]
+driver = keystone.assignment.backends.{{ assignment_backend }}.Assignment
+
+[oauth1]
+
+[signing]
+
+[auth]
+methods = external,password,token,oauth1
+password = keystone.auth.plugins.password.Password
+token = keystone.auth.plugins.token.Token
+oauth1 = keystone.auth.plugins.oauth1.OAuth
+
+[paste_deploy]
+config_file = keystone-paste.ini
+
+[extra_headers]
+Distribution = Ubuntu
+
+[ldap]
+{% if identity_backend == 'ldap' -%}
+url = {{ ldap_server }}
+user = {{ ldap_user }}
+password = {{ ldap_password }}
+suffix = {{ ldap_suffix }}
+
+{% if ldap_config_flags -%}
+{% for key, value in ldap_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if ldap_readonly -%}
+user_allow_create = False
+user_allow_update = False
+user_allow_delete = False
+
+tenant_allow_create = False
+tenant_allow_update = False
+tenant_allow_delete = False
+
+role_allow_create = False
+role_allow_update = False
+role_allow_delete = False
+
+group_allow_create = False
+group_allow_update = False
+group_allow_delete = False
+{% endif -%}
+{% endif -%}

=== added file 'templates/kilo/logging.conf'
--- templates/kilo/logging.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/logging.conf	2015-02-03 22:16:27 +0000
@@ -0,0 +1,44 @@
+# kilo
+[loggers]
+keys=root
+
+[formatters]
+keys=normal,normal_with_name,debug
+
+[handlers]
+keys=production,file,devel
+
+[logger_root]
+{% if root_level -%}
+level={{ root_level }}
+{% else -%}
+level=WARNING
+{% endif -%}
+handlers=file
+
+[handler_production]
+class=handlers.SysLogHandler
+level=ERROR
+formatter=normal_with_name
+args=(('localhost', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER)
+
+[handler_file]
+class=FileHandler
+level=DEBUG
+formatter=normal_with_name
+args=('/var/log/keystone/keystone.log', 'a')
+
+[handler_devel]
+class=StreamHandler
+level=NOTSET
+formatter=debug
+args=(sys.stdout,)
+
+[formatter_normal]
+format=%(asctime)s %(levelname)s %(message)s
+
+[formatter_normal_with_name]
+format=(%(name)s): %(asctime)s %(levelname)s %(message)s
+
+[formatter_debug]
+format=(%(name)s): %(asctime)s %(levelname)s %(module)s %(funcName)s %(message)s