Merge lp:~hopem/charms/trusty/ceilometer/pki-token-support into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next

[Edward Hope-Morley]

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

charm_lint_check #2138 ceilometer-next for hopem mp250373
    LINT OK: passed

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

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

charm_unit_test #1927 ceilometer-next for hopem mp250373
    UNIT OK: passed

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

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

charm_amulet_test #2046 ceilometer-next for hopem mp250373
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

[lp:~hopem/charms/trusty/ceilometer/pki-token-support]

76. By Edward Hope-Morley on 2015-02-24

synced /next

77. By Edward Hope-Morley on 2015-02-24

synced charm-helpers;

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

charm_lint_check #2211 ceilometer-next for hopem mp250373
    LINT OK: passed

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

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

charm_unit_test #2000 ceilometer-next for hopem mp250373
    UNIT OK: passed

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

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

charm_amulet_test #2157 ceilometer-next for hopem mp250373
    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/10396518/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2157/

[lp:~hopem/charms/trusty/ceilometer/pki-token-support]

78. By Edward Hope-Morley on 2015-03-05

ensure endpoints updated in keystone changed

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

charm_lint_check #2473 ceilometer-next for hopem mp250373
    LINT OK: passed

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

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

charm_unit_test #2263 ceilometer-next for hopem mp250373
    UNIT OK: passed

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

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

charm_amulet_test #2346 ceilometer-next for hopem mp250373
    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/10535888/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2346/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/ceilometer_contexts.py'
--- hooks/ceilometer_contexts.py	2014-12-03 23:23:51 +0000
+++ hooks/ceilometer_contexts.py	2015-03-05 06:08:49 +0000
@@ -104,8 +104,9 @@
         specific to this charm.
         '''
         haproxy_port = CEILOMETER_PORT
-        api_port = determine_api_port(CEILOMETER_PORT)
-        apache_port = determine_apache_port(CEILOMETER_PORT)
+        api_port = determine_api_port(CEILOMETER_PORT, singlenode_mode=True)
+        apache_port = determine_apache_port(CEILOMETER_PORT,
+                                            singlenode_mode=True)
 
         ctxt = {
             'service_ports': {'ceilometer_api': [haproxy_port, apache_port]},
@@ -116,6 +117,5 @@
 
 class ApacheSSLContext(SSLContext):
 
+    external_ports = [CEILOMETER_PORT]
     service_namespace = "ceilometer"
-
-    external_ports = [CEILOMETER_PORT+100]

=== modified file 'hooks/ceilometer_hooks.py'
--- hooks/ceilometer_hooks.py	2015-02-19 01:55:28 +0000
+++ hooks/ceilometer_hooks.py	2015-03-05 06:08:49 +0000
@@ -1,9 +1,10 @@
 #!/usr/bin/python
-
 import base64
 import shutil
+import subprocess
 import sys
 import os
+
 from charmhelpers.fetch import (
     apt_install, filter_installed_packages,
     apt_update
@@ -38,7 +39,7 @@
     get_ceilometer_context,
     get_shared_secret,
     do_openstack_upgrade,
-    set_shared_secret
+    set_shared_secret,
 )
 from ceilometer_contexts import CEILOMETER_PORT
 from charmhelpers.contrib.openstack.ip import (
@@ -85,14 +86,22 @@
 
 @hooks.hook("amqp-relation-changed",
             "shared-db-relation-changed",
-            "shared-db-relation-departed",
-            "identity-service-relation-changed")
+            "shared-db-relation-departed")
 @restart_on_change(restart_map())
 def any_changed():
     CONFIGS.write_all()
+    configure_https()
     ceilometer_joined()
 
 
[e-mail]("identity-service-relation-changed")
+@restart_on_change(restart_map())
+def identity_service_relation_changed():
+    CONFIGS.write_all()
+    configure_https()
+    keystone_joined()
+
+
 @hooks.hook("amqp-relation-departed")
 @restart_on_change(restart_map())
 def amqp_departed():
@@ -102,6 +111,21 @@
     CONFIGS.write_all()
 
 
+def configure_https():
+    """Enables SSL API Apache config if appropriate."""
+    # need to write all to ensure changes to the entire request pipeline
+    # propagate (c-api, haprxy, apache)
+    CONFIGS.write_all()
+    if 'https' in CONFIGS.complete_contexts():
+        cmd = ['a2ensite', 'openstack_https_frontend']
+        subprocess.check_call(cmd)
+    else:
+        cmd = ['a2dissite', 'openstack_https_frontend']
+        subprocess.check_call(cmd)
+
+    subprocess.check_call(['service', 'apache2', 'reload'])
+
+
 @hooks.hook('config-changed')
 @restart_on_change(restart_map())
 def config_changed():
@@ -110,6 +134,7 @@
     update_nrpe_config()
     CONFIGS.write_all()
     ceilometer_joined()
+    configure_https()
     for rid in relation_ids('identity-service'):
         keystone_joined(relid=rid)
 

=== modified file 'hooks/ceilometer_utils.py'
--- hooks/ceilometer_utils.py	2015-01-09 16:27:03 +0000
+++ hooks/ceilometer_utils.py	2015-03-05 06:08:49 +0000
@@ -65,11 +65,12 @@
 ]
 
 CEILOMETER_ROLE = "ResellerAdmin"
-
+SVC = 'ceilometer'
 
 CONFIG_FILES = OrderedDict([
     (CEILOMETER_CONF, {
-        'hook_contexts': [context.IdentityServiceContext(),
+        'hook_contexts': [context.IdentityServiceContext(service=SVC,
+                                                         service_user=SVC),
                           context.AMQPContext(ssl_dir=CEILOMETER_CONF_DIR),
                           LoggingConfigContext(),
                           MongoDBContext(),
@@ -79,7 +80,7 @@
         'services': CEILOMETER_SERVICES
     }),
     (HAPROXY_CONF, {
-        'hook_contexts': [context.HAProxyContext(),
+        'hook_contexts': [context.HAProxyContext(singlenode_mode=True),
                           HAProxyContext()],
         'services': ['haproxy'],
     }),

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
=== added file 'hooks/charmhelpers/contrib/openstack/templates/zeromq'
--- hooks/charmhelpers/contrib/openstack/templates/zeromq	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/zeromq	2015-03-05 06:08:49 +0000
@@ -0,0 +1,14 @@
+{% if zmq_host -%}
+# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
+rpc_backend = zmq
+rpc_zmq_host = {{ zmq_host }}
+{% if zmq_redis_address -%}
+rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_redis.MatchMakerRedis
+matchmaker_heartbeat_freq = 15
+matchmaker_heartbeat_ttl = 30
+[matchmaker_redis]
+host = {{ zmq_redis_address }}
+{% else -%}
+rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_ring.MatchMakerRing
+{% endif -%}
+{% endif -%}

=== renamed file 'hooks/charmhelpers/contrib/openstack/templates/zeromq' => 'hooks/charmhelpers/contrib/openstack/templates/zeromq.moved'
=== modified file 'templates/icehouse/ceilometer.conf'
--- templates/icehouse/ceilometer.conf	2014-11-12 23:42:57 +0000
+++ templates/icehouse/ceilometer.conf	2015-03-05 06:08:49 +0000
@@ -8,23 +8,29 @@
 debug = {{ debug }}
 verbose = {{ verbose }}
 use_syslog = {{ use_syslog }}
-{% include "parts/rabbitmq" %}
+
+{% include "parts/rabbitmq" -%}
+
 [api]
 port = {{ port }}
+
 [service_credentials]
 os_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
 os_tenant_name = {{ admin_tenant_name }}
 os_username = {{ admin_user }}
 os_password = {{ admin_password }}
+
 [database]
 {% if db_replset: -%}
 connection = mongodb://{{ db_mongo_servers }}/{{ db_name }}?readPreference=primaryPreferred&replicaSet={{ db_replset }}
 mongodb_replica_set = {{ db_replset }}
 {% else -%}
 connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }}
-{% endif -%}
+{% endif %}
+
 [publisher_rpc]
 metering_secret = {{ metering_secret }}
+
 [keystone_authtoken]
 auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
 auth_host = {{ auth_host }}
@@ -33,4 +39,4 @@
 admin_tenant_name = {{ admin_tenant_name }}
 admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
-
+signing_dir = {{ signing_dir }}

=== modified file 'unit_tests/test_ceilometer_hooks.py'
--- unit_tests/test_ceilometer_hooks.py	2015-01-09 16:28:11 +0000
+++ unit_tests/test_ceilometer_hooks.py	2015-03-05 06:08:49 +0000
@@ -33,6 +33,7 @@
     'canonical_url',
     'service_restart',
     'update_nrpe_config',
+    'configure_https',
 ]