openstack/charm-nova-cloud-controller
Code Issues Proposed changes

README update, enable ability to explictly set the use of the nova-cc address and use the PUBLIC address

Browse Source
This commit is contained in:
Liam Young 2014-07-30 10:49:59 +00:00
parent de639553ab
commit 8f459e2208
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.txt
View File

@ -10,8 +10,9 @@ neutron-api endpoint in keystone. It will also use the quantum-security-groups s
it by the api service rather than its own quantum-security-groups setting. it by the api service rather than its own quantum-security-groups setting.
If console access is required then console-proxy-ip should be set to a client accessible IP that resolves If console access is required then console-proxy-ip should be set to a client accessible IP that resolves
to the nova-cloud-controller. If running in HA mode this could be the vip that the nova-cloud-controller to the nova-cloud-controller. If running in HA mode then the public vip is used if console-proxy-ip is set
is behind to local. Note: The console access protocol is baked into a guest when it is created, if you change it then
console access for existing guests will stop working
****************************************************** ******************************************************
Special considerations to be deployed using Postgresql Special considerations to be deployed using Postgresql

5
config.yaml
View File

@ -210,10 +210,11 @@ options:
are None, spice, xvpvnc, novnc and vnc (for both xvpvnc and novnc) are None, spice, xvpvnc, novnc and vnc (for both xvpvnc and novnc)
console-proxy-ip: console-proxy-ip:
type: string type: string
default: '' default: local
description: | description: |
If console-access-protocol != None then this is the ip published to If console-access-protocol != None then this is the ip published to
clients for access to console proxy clients for access to console proxy. Set to local for the ip address of
the nova-cloud-controller serving the request to be used
console-keymap: console-keymap:
type: string type: string
default: 'en-us' default: 'en-us'

6
hooks/nova_cc_hooks.py
View File

@ -390,10 +390,10 @@ def console_settings():
return {} return {}
rel_settings['console_keymap'] = config('console-keymap') rel_settings['console_keymap'] = config('console-keymap')
rel_settings['console_access_protocol'] = proto rel_settings['console_access_protocol'] = proto
if len(config('console-proxy-ip')) > 0: if config('console-proxy-ip') == 'local':
proxy_base_addr = "http://" + config('console-proxy-ip') proxy_base_addr = canonical_url(CONFIGS, PUBLIC)
else: else:
proxy_base_addr = canonical_url(CONFIGS) proxy_base_addr = "http://" + config('console-proxy-ip')
if proto == 'vnc': if proto == 'vnc':
protocols = ['novnc', 'xvpvnc'] protocols = ['novnc', 'xvpvnc']
else: else: