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

README.txt

@@ -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.
 
 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
-is behind
+to the nova-cloud-controller. If running in HA mode then the public vip is used if console-proxy-ip is set
+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

config.yaml

@@ -210,10 +210,11 @@ options:
        are None, spice, xvpvnc, novnc and vnc (for both xvpvnc and novnc)
   console-proxy-ip:
     type: string
-    default: ''
+    default: local
     description: |
        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:
     type: string
     default: 'en-us'

hooks/nova_cc_hooks.py

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