From 99d74172887ab81d38132655d6e5d180e8726437 Mon Sep 17 00:00:00 2001
From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Date: Fri, 13 Jun 2014 10:41:24 +0000
Subject: [PATCH] Remove stdlib::safe_package dependencies

- Sync libvirt.pp flatdhcp.pp vlan.pp with upstream
- Remove safe_package from server.pp to keep stdlib unmodified

Change-Id: I6d79d9a78d9805fcabf088e57b1072d98badbeb4
Implements: blueprint merge-openstack-puppet-modules
---
 .../puppet/nova/manifests/compute/libvirt.pp  |  2 -
 .../puppet/nova/manifests/network/flatdhcp.pp | 49 +++++++++++++++++--
 .../puppet/nova/manifests/network/vlan.pp     | 41 +++++++++++++++-
 .../puppet/rabbitmq/manifests/server.pp       |  2 +-
 4 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/deployment/puppet/nova/manifests/compute/libvirt.pp b/deployment/puppet/nova/manifests/compute/libvirt.pp
index 0fd221c9cd..801b495048 100644
--- a/deployment/puppet/nova/manifests/compute/libvirt.pp
+++ b/deployment/puppet/nova/manifests/compute/libvirt.pp
@@ -12,8 +12,6 @@ class nova::compute::libvirt (
       command => "/bin/ln -sf /usr/libexec/qemu-kvm /usr/bin/qemu-system-x86_64",
     }
 
-    stdlib::safe_package {'dnsmasq-utils':}
-
     package { 'avahi':
       ensure => present;
     } ->
diff --git a/deployment/puppet/nova/manifests/network/flatdhcp.pp b/deployment/puppet/nova/manifests/network/flatdhcp.pp
index be8e056166..76869007fe 100644
--- a/deployment/puppet/nova/manifests/network/flatdhcp.pp
+++ b/deployment/puppet/nova/manifests/network/flatdhcp.pp
@@ -1,7 +1,47 @@
-# flatdhcp.pp
+# == Class: nova::network::flatdhcp
+#
+# Configures nova-network with flat dhcp option
+#
+# === Parameters:
+#
+# [*fixed_range*]
+#   (required) The IPv4 CIDR for the flat network
+#
+# [*flat_interface*]
+#   (optional) FlatDHCP will bridge into this interface
+#   Defaults to undef
+#
+# [*public_interface*]
+#   (optional)
+#   Defaults to undef
+#
+# [*flat_network_bridge*]
+#   (optional) Bridge for simple network instances (
+#   Defaults to 'br100'
+#
+# [*force_dhcp_release*]
+#   (optional) Send a dhcp release on instance termination
+#   Defaults to true
+#
+# [*flat_injected*]
+#   (optional) Whether to attempt to inject network setup into guest
+#   Defaults to false
+#
+# [*dhcp_domain*]
+#   (optional) domain to use for building the hostnames
+#   Defaults to 'novalocal'
+#
+# [*dhcpbridge*]
+#   (optional) 'location of nova-dhcpbridge'
+#   Defaults to '/usr/bin/nova-dhcpbridge'
+#
+# [*dhcpbridge_flagfile*]
+#   (optional) location of flagfiles for dhcpbridge
+#   Defaults to '/etc/nova/nova.conf
+#
 class nova::network::flatdhcp (
-  $flat_interface,
   $fixed_range,
+  $flat_interface      = undef,
   $public_interface    = undef,
   $flat_network_bridge = 'br100',
   $force_dhcp_release  = true,
@@ -11,6 +51,10 @@ class nova::network::flatdhcp (
   $dhcpbridge_flagfile = '/etc/nova/nova.conf'
 ) {
 
+  if $::osfamily == 'RedHat' and $::operatingsystem != 'Fedora' {
+    package { 'dnsmasq-utils': ensure => present }
+  }
+
   if $public_interface {
     nova_config { 'DEFAULT/public_interface': value => $public_interface }
   }
@@ -20,7 +64,6 @@ class nova::network::flatdhcp (
     'DEFAULT/fixed_range':         value => $fixed_range;
     'DEFAULT/flat_interface':      value => $flat_interface;
     'DEFAULT/flat_network_bridge': value => $flat_network_bridge;
-    #'flat_dhcp_start':     value => $flat_dhcp_start;
     'DEFAULT/force_dhcp_release':  value => $force_dhcp_release;
     'DEFAULT/flat_injected':       value => $flat_injected;
     'DEFAULT/dhcp_domain':         value => $dhcp_domain;
diff --git a/deployment/puppet/nova/manifests/network/vlan.pp b/deployment/puppet/nova/manifests/network/vlan.pp
index 2b39141bf7..2328488a43 100644
--- a/deployment/puppet/nova/manifests/network/vlan.pp
+++ b/deployment/puppet/nova/manifests/network/vlan.pp
@@ -1,4 +1,39 @@
-#vlan.pp
+# == Class: nova::network::vlan
+#
+# Configures nova network to use vlans
+#
+# === Parameters:
+#
+# [*fixed_range*]
+#   (required) IPv4 CIDR of the network
+#
+# [*vlan_interface*]
+#   (required) Physical ethernet adapter name for vlan networking
+#
+# [*public_interface*]
+#   (optional) Interface for public traffic
+#   Defaults to undef
+#
+# [*vlan_start*]
+#   (optional) First vlan to use
+#   Defaults to '300'
+#
+# [*force_dhcp_release*]
+#   (optional) Whether to send a dhcp release on instance termination
+#   Defaults to true
+#
+# [*dhcp_domain*]
+#   (optional) Domain to use for building the hostnames
+#   Defaults to 'novalocal'
+#
+# [*dhcpbridge*]
+#   (optional) location of nova-dhcpbridge
+#   Defaults to '/usr/bin/nova-dhcpbridge'
+#
+# [*dhcpbridge_flagfile*]
+#   (optional) location of flagfiles for dhcpbridge
+#   Defaults to '/etc/nova/nova.conf'
+#
 class nova::network::vlan (
   $fixed_range,
   $vlan_interface,
@@ -10,6 +45,10 @@ class nova::network::vlan (
   $dhcpbridge_flagfile = '/etc/nova/nova.conf'
 ) {
 
+  if $::osfamily == 'RedHat' and $::operatingsystem != 'Fedora' {
+    package { 'dnsmasq-utils': ensure => present }
+  }
+
   if $public_interface {
     nova_config { 'DEFAULT/public_interface': value => $public_interface }
   }
diff --git a/deployment/puppet/rabbitmq/manifests/server.pp b/deployment/puppet/rabbitmq/manifests/server.pp
index 1ec3d59670..f54d9e4e99 100644
--- a/deployment/puppet/rabbitmq/manifests/server.pp
+++ b/deployment/puppet/rabbitmq/manifests/server.pp
@@ -75,7 +75,7 @@ class rabbitmq::server(
   $plugin_dir = "/usr/lib/rabbitmq/lib/rabbitmq_server-${version_real}/plugins"
 
   if $::osfamily == 'RedHat' {
-    stdlib::safe_package {'qpid-cpp-server': ensure => 'purged' }
+    package {'qpid-cpp-server': ensure => 'purged' }
     Package['qpid-cpp-server'] -> Package[$package_name]
   }