aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-31 11:53:28 +0000
committerGerrit Code Review <review@openstack.org>2015-03-31 11:53:28 +0000
commitd7237747abe853c85643024624664f987e08c165 (patch)
tree1fc737a471b538dd04a6b02ea52382dd04ca2b5c
parent2c156c1c1370d409e0b58858d78c3c6e26cda6cd (diff)
parentc0658056cfc13cc4fc40057847573801f77869e9 (diff)
Merge "puppet+devtest: make compute nodes reachable"
-rw-r--r--puppet/manifests/overcloud_compute.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index eef468da..d02725ab 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -33,6 +33,13 @@ file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
ensure => absent,
before => Service['libvirt']
}
+# in case libvirt has been already running before the Puppet run, make
+# sure the default network is destroyed
+exec { 'libvirt-default-net-destroy':
+ command => '/usr/bin/virsh net-destroy default',
+ onlyif => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
+ before => Service['libvirt'],
+}
include ::nova
include ::nova::compute