aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-06 22:49:51 +0000
committerGerrit Code Review <review@openstack.org>2017-02-06 22:49:51 +0000
commit3c125d3c760690e0f5de25b7d27188514571332f (patch)
tree211f7ec1a8ae01d3a83a29cc1e10948f898512ef /manifests
parent22c5d341776c02dfafab1f58f68a852da34f3692 (diff)
parent6556123395c14f21de31e844426e541c141ffaaa (diff)
Merge "nova/libvirt: switch vnc server binding"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/nova/compute/libvirt.pp13
1 files changed, 1 insertions, 12 deletions
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index 6767f6b..cc9beb6 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -40,24 +40,13 @@ class tripleo::profile::base::nova::compute::libvirt (
}
}
- # TODO(emilien): Some work needs to be done in puppet-nova to separate nova-compute config
- # when running libvirt and libvirt itself, so we allow micro-services deployments.
- if str2bool(hiera('nova::use_ipv6', false)) {
- $vncserver_listen = '::0'
- } else {
- $vncserver_listen = '0.0.0.0'
- }
-
if $rbd_ephemeral_storage {
class { '::nova::compute::libvirt':
libvirt_disk_cachemodes => ['network=writeback'],
libvirt_hw_disk_discard => 'unmap',
- vncserver_listen => $vncserver_listen,
}
} else {
- class { '::nova::compute::libvirt' :
- vncserver_listen => $vncserver_listen,
- }
+ include ::nova::compute::libvirt
}
include ::nova::compute::libvirt::qemu