Change config option to os-public-hostname and lint error.

config.yaml

@@ -87,7 +87,7 @@ options:
     description: |
       Default multicast port number that will be used to communicate between
       HA Cluster nodes.
-  endpoint-public-name:
+  os-public-hostname:
     type: string
     default:
     description: |
@@ -95,7 +95,7 @@ options:
       in the keystone identity provider.
       .
       This value will be used for public endpoints. For example, an
-      endpoint-public-name set to 'files.example.com' with will create
+      os-public-hostname set to 'files.example.com' with will create
       the following public endpoint for the ceph-radosgw.
       .
       https://files.example.com:80/swift/v1

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_hooks.py

@@ -351,9 +351,10 @@ class CephRadosGWTests(CharmTestCase):
     @patch('charmhelpers.contrib.openstack.ip.is_clustered')
     @patch('charmhelpers.contrib.openstack.ip.unit_get')
     @patch('charmhelpers.contrib.openstack.ip.config')
-    def test_identity_joined_public_name(self, _config, _unit_get, _is_clustered):
+    def test_identity_joined_public_name(self, _config, _unit_get,
+                                         _is_clustered):
         _config.side_effect = self.test_config.get
-        self.test_config.set('endpoint-public-name', 'files.example.com')
+        self.test_config.set('os-public-hostname', 'files.example.com')
         _unit_get.return_value = 'myserv'
         _is_clustered.return_value = False
         ceph_hooks.identity_joined(relid='rid')