openstack
/
charm-swift-proxy
Code Issues Proposed changes

Change config option to os-public-hostname

This commit is contained in:
Billy Olsen 2015-06-03 11:29:42 -07:00
parent 029afb3131
commit 28b4036694
2 changed files with 5 additions and 5 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)
.
This network will be used for public endpoints.
endpoint-public-name:
os-public-hostname:
type: string
default:
description: |
@ -215,7 +215,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 swift-proxy.
.
https://files.example.com:80/swift/v1

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

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