Merge lp:~billy-olsen/charms/trusty/cinder/backport-lp-1351401 into lp:~openstack-charmers-archive/charms/trusty/cinder/trunk

[Billy Olsen]

Backport fix for lp 1351401 into stable

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

charm_lint_check #2760 cinder for billy-olsen mp253599
    LINT OK: passed

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

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

charm_unit_test #2551 cinder for billy-olsen mp253599
    UNIT OK: passed

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

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

charm_amulet_test #2599 cinder for billy-olsen mp253599
    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/10630824/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2599/

[Liang Chen (cbjchen)]

LGTM

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-03-05 11:07:55 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-03-19 23:15:43 +0000
@@ -64,6 +64,10 @@
 from charmhelpers.contrib.openstack.neutron import (
     neutron_plugin_attribute,
 )
+from charmhelpers.contrib.openstack.ip import (
+    resolve_address,
+    INTERNAL,
+)
 from charmhelpers.contrib.network.ip import (
     get_address_in_network,
     get_ipv6_addr,
@@ -677,7 +681,14 @@
                 'endpoints': [],
                 'ext_ports': []}
 
-        for cn in self.canonical_names():
+        cns = self.canonical_names()
+        if cns:
+            for cn in cns:
+                self.configure_cert(cn)
+        else:
+            # Expect cert/key provided in config (currently assumed that ca
+            # uses ip for cn)
+            cn = resolve_address(endpoint_type=INTERNAL)
             self.configure_cert(cn)
 
         addresses = self.get_network_addresses()