openstack/charm-neutron-api
Code Issues Proposed changes

Change config option to be os-public-hostname

Browse Source
This commit is contained in:
Billy Olsen 2015-06-03 11:25:21 -07:00
parent 3f601c5824
commit acdb35633e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@ -235,7 +235,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: |
@ -243,7 +243,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 'neutron-api.example.com' with ssl enabled os-public-hostname set to 'neutron-api.example.com' with ssl enabled
will create the following endpoint for neutron-api: will create the following endpoint for neutron-api:
. .
https://neutron-api.example.com:9696/ https://neutron-api.example.com:9696/

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

2
unit_tests/test_neutron_api_hooks.py
View File

@ -347,7 +347,7 @@ class NeutronAPIHooksTests(CharmTestCase):
_config.side_effect = self.test_config.get _config.side_effect = self.test_config.get
self.api_port.return_value = '9696' self.api_port.return_value = '9696'
self.test_config.set('region', 'region1') self.test_config.set('region', 'region1')
self.test_config.set('endpoint-public-name', self.test_config.set('os-public-hostname',
'neutron-api.example.com') 'neutron-api.example.com')
self._call_hook('identity-service-relation-joined') self._call_hook('identity-service-relation-joined')
_neutron_url = 'http://127.0.0.1:9696' _neutron_url = 'http://127.0.0.1:9696'