openstack/charm-cinder
Code Issues Proposed changes

Change config option to os-public-hostname and lint

Browse Source
This commit is contained in:
Billy Olsen 2015-06-03 11:21:52 -07:00
parent 92ef39bfed
commit eed60d0821
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@ -207,7 +207,7 @@ options:
192.168.0.0/24) 192.168.0.0/24)
. .
This network will be used for public endpoints. This network will be used for public endpoints.
endpoint-public-name: os-public-hostname:
type: string type: string
default: default:
description: | description: |
@ -215,7 +215,7 @@ options:
in the keystone identity provider. in the keystone identity provider.
. .
This value will be used for public endpoints. For example, an This value will be used for public endpoints. For example, an
endpoint-public-name set to 'cinder.example.com' with ssl enabled will os-public-hostname set to 'cinder.example.com' with ssl enabled will
create two public endpoints for cinder. create two public endpoints for cinder.
. .
https://cinder.example.com:443/v1/$(tenant_id)s and https://cinder.example.com:443/v1/$(tenant_id)s and

6
hooks/charmhelpers/contrib/openstack/ip.py
View File

@ -34,17 +34,17 @@ ADDRESS_MAP = {
PUBLIC: { PUBLIC: {
'config': 'os-public-network', 'config': 'os-public-network',
'fallback': 'public-address', 'fallback': 'public-address',
'override': 'endpoint-public-name', 'override': 'os-public-hostname',
}, },
INTERNAL: { INTERNAL: {
'config': 'os-internal-network', 'config': 'os-internal-network',
'fallback': 'private-address', 'fallback': 'private-address',
'override': 'endpoint-internal-name', 'override': 'os-internal-hostname',
}, },
ADMIN: { ADMIN: {
'config': 'os-admin-network', 'config': 'os-admin-network',
'fallback': 'private-address', 'fallback': 'private-address',
'override': 'endpoint-admin-name', 'override': 'os-admin-hostname',
} }
} }

8
unit_tests/test_cinder_hooks.py
View File

@ -473,7 +473,7 @@ class TestJoinedHooks(CharmTestCase):
_unit_get.return_value = 'cindernode1' _unit_get.return_value = 'cindernode1'
self.config.side_effect = self.test_config.get self.config.side_effect = self.test_config.get
_config.side_effect = self.test_config.get _config.side_effect = self.test_config.get
self.test_config.set('endpoint-public-name', 'public.example.com') self.test_config.set('os-public-hostname', 'public.example.com')
_is_clustered.return_value = False _is_clustered.return_value = False
hooks.hooks.execute(['hooks/identity-service-relation-joined']) hooks.hooks.execute(['hooks/identity-service-relation-joined'])
expected = { expected = {
@ -484,12 +484,14 @@ class TestJoinedHooks(CharmTestCase):
'admin_url': None, 'admin_url': None,
'cinder_service': 'cinder', 'cinder_service': 'cinder',
'cinder_region': 'RegionOne', 'cinder_region': 'RegionOne',
'cinder_public_url': 'http://public.example.com:8776/v1/$(tenant_id)s', 'cinder_public_url':
'http://public.example.com:8776/v1/$(tenant_id)s',
'cinder_admin_url': 'http://cindernode1:8776/v1/$(tenant_id)s', 'cinder_admin_url': 'http://cindernode1:8776/v1/$(tenant_id)s',
'cinder_internal_url': 'http://cindernode1:8776/v1/$(tenant_id)s', 'cinder_internal_url': 'http://cindernode1:8776/v1/$(tenant_id)s',
'cinderv2_service': 'cinderv2', 'cinderv2_service': 'cinderv2',
'cinderv2_region': 'RegionOne', 'cinderv2_region': 'RegionOne',
'cinderv2_public_url': 'http://public.example.com:8776/v2/$(tenant_id)s', 'cinderv2_public_url':
'http://public.example.com:8776/v2/$(tenant_id)s',
'cinderv2_admin_url': 'http://cindernode1:8776/v2/$(tenant_id)s', 'cinderv2_admin_url': 'http://cindernode1:8776/v2/$(tenant_id)s',
'cinderv2_internal_url': 'http://cindernode1:8776/' 'cinderv2_internal_url': 'http://cindernode1:8776/'
'v2/$(tenant_id)s', 'v2/$(tenant_id)s',