summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-03 21:40:04 +0000
committerGerrit Code Review <review@openstack.org>2017-02-03 21:40:04 +0000
commit2527e459e271ddcfbe38319644dad4f76d51f32b (patch)
tree82f2af5ff49186de9915e2a6d0173e52549dbd21
parent340a3dffbb423322ef28a99a893771bed12e53aa (diff)
parent064f7d6b444d909636c2fc0f97fa4215d96381f2 (diff)
Merge "Configure VNC Server listen address through t-h-t"
-rw-r--r--network/service_net_map.j2.yaml1
-rw-r--r--puppet/services/nova-libvirt.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index 390b18b4..b2562c79 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -49,6 +49,7 @@ parameters:
NovaPlacementNetwork: internal_api
NovaMetadataNetwork: internal_api
NovaVncProxyNetwork: internal_api
+ NovaLibvirtNetwork: internal_api
Ec2ApiNetwork: internal_api
Ec2ApiMetadataNetwork: internal_api
SwiftStorageNetwork: storage_mgmt
diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml
index a9b2b3f9..faf1ae48 100644
--- a/puppet/services/nova-libvirt.yaml
+++ b/puppet/services/nova-libvirt.yaml
@@ -62,6 +62,7 @@ outputs:
nova::compute::libvirt::qemu::configure_qemu: true
nova::compute::libvirt::qemu::max_files: 32768
nova::compute::libvirt::qemu::max_processes: 131072
+ nova::compute::libvirt::vncserver_listen: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
tripleo.nova_libvirt.firewall_rules:
'200 nova_libvirt':
dport: