From 2e2e62bd75ddcf739af57444dbacaa17410f9e1c Mon Sep 17 00:00:00 2001
From: Billy Olsen <billy.olsen@canonical.com>
Date: Wed, 3 Jun 2015 11:22:54 -0700
Subject: [PATCH] Switch config option to os-public-hostname

---
 config.yaml                                | 4 ++--
 hooks/charmhelpers/contrib/openstack/ip.py | 6 +++---
 unit_tests/test_glance_relations.py        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.yaml b/config.yaml
index 96306bf3..0c498760 100644
--- a/config.yaml
+++ b/config.yaml
@@ -176,7 +176,7 @@ options:
       192.168.0.0/24)
       .
       This network will be used for public endpoints.
-  endpoint-public-name:
+  os-public-hostname:
     type: string
     default:
     description: |
@@ -184,7 +184,7 @@ options:
       in the keystone identity provider.
       .
       This value will be used for public endpoints. For example, an
-      endpoint-public-name set to 'glance.example.com' with ssl enabled will
+      os-public-hostname set to 'glance.example.com' with ssl enabled will
       create a public endpoint for glance of https://glance.example.com:9292/
   prefer-ipv6:
     type: boolean
diff --git a/hooks/charmhelpers/contrib/openstack/ip.py b/hooks/charmhelpers/contrib/openstack/ip.py
index 45531b57..6e18c98a 100644
--- a/hooks/charmhelpers/contrib/openstack/ip.py
+++ b/hooks/charmhelpers/contrib/openstack/ip.py
@@ -34,17 +34,17 @@ ADDRESS_MAP = {
     PUBLIC: {
         'config': 'os-public-network',
         'fallback': 'public-address',
-        'override': 'endpoint-public-name',
+        'override': 'os-public-hostname',
     },
     INTERNAL: {
         'config': 'os-internal-network',
         'fallback': 'private-address',
-        'override': 'endpoint-internal-name',
+        'override': 'os-internal-hostname',
     },
     ADMIN: {
         'config': 'os-admin-network',
         'fallback': 'private-address',
-        'override': 'endpoint-admin-name',
+        'override': 'os-admin-hostname',
     }
 }
 
diff --git a/unit_tests/test_glance_relations.py b/unit_tests/test_glance_relations.py
index 26861ea3..a0d99811 100644
--- a/unit_tests/test_glance_relations.py
+++ b/unit_tests/test_glance_relations.py
@@ -477,7 +477,7 @@ class GlanceRelationTests(CharmTestCase):
                                              _is_clustered):
         _unit_get.return_value = 'glancehost'
         _is_clustered.return_value = False
-        self.test_config.set('endpoint-public-name', 'glance.example.com')
+        self.test_config.set('os-public-hostname', 'glance.example.com')
         _config.side_effect = self.test_config.get
         relations.keystone_joined()
         ex = {