diff options
author | Dan Prince <dprince@redhat.com> | 2015-06-10 19:47:41 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2015-06-10 19:47:41 -0400 |
commit | 2f18f063568a8624dcdf965a2e33e12203797559 (patch) | |
tree | 90f932d9e8f2563d1bc6d88dd2f329f8f59bc83d /puppet | |
parent | 5033fd06894c3ac9ff99a82cb74020868da42306 (diff) |
Isolate network traffic for Nova VNC proxy
This patch makes it possible to configure the isolated network
for the Nova vnc proxy client.
Change-Id: I462dfaea94e5fe9cb260ba91a42433a250f07984
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/compute-puppet.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 12e701dd..9e17b890 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -338,8 +338,6 @@ resources: raw_data: {get_file: hieradata/ceph.yaml} compute: raw_data: {get_file: hieradata/compute.yaml} - oac_data: - nova::compute::vncserver_proxyclient_address: local-ipv4 mapped_data: nova::debug: {get_input: debug} nova::rabbit_userid: {get_input: rabbit_username} @@ -352,6 +350,7 @@ resources: nova::compute::vncproxy_host: {get_input: nova_public_ip} nova_enable_rbd_backend: {get_input: nova_enable_rbd_backend} nova_password: {get_input: nova_password} + nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address} ceilometer::debug: {get_input: debug} ceilometer::rabbit_userid: {get_input: rabbit_username} ceilometer::rabbit_password: {get_input: rabbit_password} @@ -406,6 +405,7 @@ resources: nova_api_host: {get_param: NovaApiHost} nova_password: {get_param: NovaPassword} nova_enable_rbd_backend: {get_param: NovaEnableRbdBackend} + nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]} ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} ceilometer_compute_agent: {get_param: CeilometerComputeAgent} |