more

hooks/heat_relations.py

@@ -44,7 +44,6 @@ from charmhelpers.contrib.openstack.utils import (
 
 from charmhelpers.contrib.openstack.ip import (
     canonical_url,
-    get_ipv6_addr,
     ADMIN,
     INTERNAL,
     PUBLIC,

hooks/heat_utils.py

@@ -86,7 +86,8 @@ CONFIG_FILES = OrderedDict([
                      HeatIdentityServiceContext(service=SVC, service_user=SVC),
                      HeatHAProxyContext(),
                      EncryptionContext(),
-                     context.SyslogContext()]
+                     context.SyslogContext(),
+                     context.BindHostContext()]
     }),
     (HEAT_API_PASTE, {
         'services': [s for s in BASE_SERVICES if 'api' in s],

templates/kilo/heat.conf

@@ -64,6 +64,7 @@ connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{
 api_paste_config=/etc/heat/api-paste.ini
 
 [heat_api]
+bind_host = {{ bind_host }}
 {% if api_listen_port -%} 
 bind_port={{ api_listen_port }}
 {% else -%}
@@ -71,6 +72,7 @@ bind_port=8004
 {% endif %}
 
 [heat_api_cfn]
+bind_host = {{ bind_host }}
 {% if api_cfn_listen_port -%}
 bind_port={{ api_cfn_listen_port }}
 {% else -%}

unit_tests/test_heat_relations.py

@@ -31,7 +31,6 @@ TO_PATCH = [
     'openstack_upgrade_available',
     'determine_packages',
     'charm_dir',
-    'get_ipv6_addr',
     'sync_db_with_multi_ipv6_addresses',
     # charmhelpers.contrib.hahelpers.cluster_utils
     # heat_utils
@@ -238,7 +237,6 @@ class HeatRelationTests(CharmTestCase):
     def test_db_joined_with_ipv6(self):
         'It properly requests access to a shared-db service'
         self.unit_get.return_value = 'heatnode1'
-        self.get_ipv6_addr.return_value = ['2001:db8:1::1']
         self.sync_db_with_multi_ipv6_addresses.return_value = MagicMock()
         self.test_config.set('prefer-ipv6', True)
         relations.db_joined()