From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 31 Mar 2015 12:48:23 +0000 (+0000)
Subject: Merge "Refactor allNodesConfig"
X-Git-Tag: opnfv-6.0.0~2636
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=431b65a32fd0880bb14ddaf07e2f53ac42f10dad;hp=5ddcfb66554a00e405351fee770892d219123b31;p=apex-tripleo-heat-templates.git

Merge "Refactor allNodesConfig"
---

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
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index bad5fdb7..c27c48d1 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -317,7 +317,7 @@ if hiera('step') >= 3 {
     }
   }
 
-  $cinder_enabled_backends = concat(any2array($cinder_iscsi_backend), $cinder_rbd_backend)
+  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend])
   class { '::cinder::backends' :
     enabled_backends => $cinder_enabled_backends,
   }