Switch config option to os-public-hostname

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

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',
     }
 }
 

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 = {