diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-03-10 21:15:43 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-03-10 21:15:43 +0000 |
commit | d7bda879e747b8713114755f9a06ed887a59cfe9 (patch) | |
tree | 8464e46f3ff616d58edcb8a28b9bd82fe6533310 /puppet/manifests | |
parent | 4ed596dbec9b8b619315fb5c88d8f132054f21b3 (diff) | |
parent | ab5dece332ed85954864ed5ec9ad59ff087366d1 (diff) |
Merge "Allow the vnc server to bind on IPv6 address on computes"
Diffstat (limited to 'puppet/manifests')
-rw-r--r-- | puppet/manifests/overcloud_compute.pp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 99220ffd..c5762be0 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -83,7 +83,14 @@ if hiera('cinder_enable_nfs_backend', false) { package {'nfs-utils': } -> Service['nova-compute'] } -include ::nova::compute::libvirt +if str2bool(hiera('nova::use_ipv6', false)) { + $vncserver_listen = '::0' +} else { + $vncserver_listen = '0.0.0.0' +} +class { '::nova::compute::libvirt' : + vncserver_listen => $vncserver_listen, +} if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { file {'/etc/libvirt/qemu.conf': ensure => present, |