Merge "Customize vcpu_pin_set in nova.conf"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_compute.pp

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 7255db8..f96c193 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -13,17 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-include ::tripleo::packages
-include ::tripleo::firewall
-
 if hiera('step') >= 4 {
-
-  nova_config {
-    'DEFAULT/my_ip': value => $ipaddress;
-    'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
-  }
-
-  hiera_include('compute_classes')
+  hiera_include('compute_classes', [])
 }
 
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_compute', hiera('step')])