Bind vncserver_proxyclient_address to internal network.
Change-Id: I2448e01dae6bf3524350208ce8a61b7e04057ca3 Closes-Bug: 1643375
This commit is contained in:
parent
e516fc01dc
commit
47e4962492
@ -311,6 +311,14 @@ options:
|
|||||||
wait for you to execute the openstack-upgrade action for this charm on
|
wait for you to execute the openstack-upgrade action for this charm on
|
||||||
each unit. If False it will revert to existing behavior of upgrading
|
each unit. If False it will revert to existing behavior of upgrading
|
||||||
all units on config change.
|
all units on config change.
|
||||||
|
os-internal-network:
|
||||||
|
type: string
|
||||||
|
default:
|
||||||
|
description: |
|
||||||
|
The IP address and netmask of the OpenStack Internal network (e.g.
|
||||||
|
192.168.0.0/24)
|
||||||
|
|
||||||
|
This network will be used to bind vncproxy client.
|
||||||
harden:
|
harden:
|
||||||
default:
|
default:
|
||||||
type: string
|
type: string
|
||||||
|
@ -40,7 +40,10 @@ from charmhelpers.contrib.openstack.utils import (
|
|||||||
get_os_version_package,
|
get_os_version_package,
|
||||||
get_os_version_codename,
|
get_os_version_codename,
|
||||||
)
|
)
|
||||||
|
from charmhelpers.contrib.openstack.ip import (
|
||||||
|
INTERNAL,
|
||||||
|
resolve_address,
|
||||||
|
)
|
||||||
from charmhelpers.contrib.network.ip import (
|
from charmhelpers.contrib.network.ip import (
|
||||||
get_ipv6_addr,
|
get_ipv6_addr,
|
||||||
)
|
)
|
||||||
@ -533,7 +536,7 @@ class InstanceConsoleContext(context.OSContextGenerator):
|
|||||||
else:
|
else:
|
||||||
ctxt = dict(ctxt, **self.get_console_info(proto, **rel))
|
ctxt = dict(ctxt, **self.get_console_info(proto, **rel))
|
||||||
break
|
break
|
||||||
ctxt['console_listen_addr'] = get_host_ip(unit_get('private-address'))
|
ctxt['console_listen_addr'] = resolve_address(endpoint_type=INTERNAL)
|
||||||
return ctxt
|
return ctxt
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,6 +21,8 @@ provides:
|
|||||||
nrpe-external-master:
|
nrpe-external-master:
|
||||||
interface: nrpe-external-master
|
interface: nrpe-external-master
|
||||||
scope: container
|
scope: container
|
||||||
|
extra-bindings:
|
||||||
|
internal:
|
||||||
requires:
|
requires:
|
||||||
shared-db:
|
shared-db:
|
||||||
interface: mysql-shared
|
interface: mysql-shared
|
||||||
|
Loading…
x
Reference in New Issue
Block a user