From 4f734e073892b87735d87831e06d451d5d3b6f0f Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Sun, 2 Apr 2017 21:45:28 +0200
Subject: [PATCH] Move unbound to openstack_project::server

Once nodepool is installing and fully configuring unbound, we don't need
to manage it in the common openstack_project::template class. This patch
moves them over to openstack_project::server so that it is obvious that
puppet doesn't need to manage them for both single-use workers and
long-lived servers. Eventually the openstack_project::template class
should be empty and we can remove it.

Depends-On: I3905be12acd85581a608d87ba5159cc883343a37
Change-Id: Ie1daae8471d424f373b47262e9d0b21c15affce9
---
 modules/openstack_project/manifests/server.pp         | 11 ++++++++++-
 .../openstack_project/manifests/single_use_slave.pp   |  2 --
 modules/openstack_project/manifests/template.pp       |  7 -------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 35b49fec8f..802fb33ed7 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -74,6 +74,16 @@ class openstack_project::server (
     }
   }
 
+  ###########################################################
+  # Process if ( $high_level_directive ) blocks
+
+  if ($enable_unbound) {
+    class { 'unbound':
+      install_resolv_conf => $install_resolv_conf
+    }
+  }
+
+
   class { 'openstack_project::template':
     iptables_public_tcp_ports => $iptables_public_tcp_ports,
     iptables_public_udp_ports => $iptables_public_udp_ports,
@@ -83,7 +93,6 @@ class openstack_project::server (
     pin_puppet                => $pin_puppet,
     ca_server                 => $ca_server,
     puppetmaster_server       => $puppetmaster_server,
-    enable_unbound            => $enable_unbound,
     afs                       => $afs,
     afs_cache_size            => $afs_cache_size,
     manage_exim               => $manage_exim,
diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp
index 05ac5618da..5976b03ad1 100644
--- a/modules/openstack_project/manifests/single_use_slave.pp
+++ b/modules/openstack_project/manifests/single_use_slave.pp
@@ -14,7 +14,6 @@ class openstack_project::single_use_slave (
   $thin = true,
   $automatic_upgrades = false,
   $all_mysql_privs = false,
-  $enable_unbound = true,
   $ssh_key = $openstack_project::jenkins_ssh_key,
   $jenkins_gitfullname = 'OpenStack Jenkins',
   $jenkins_gitemail = 'jenkins@openstack.org',
@@ -25,7 +24,6 @@ class openstack_project::single_use_slave (
     automatic_upgrades        => $automatic_upgrades,
     install_users             => $install_users,
     install_resolv_conf       => $install_resolv_conf,
-    enable_unbound            => $enable_unbound,
     permit_root_login         => 'yes',
     iptables_rules4           =>
       [
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 7d72bf3db2..bff3d8d8cd 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -13,7 +13,6 @@ class openstack_project::template (
   $automatic_upgrades        = true,
   $certname                  = $::fqdn,
   $ca_server                 = undef,
-  $enable_unbound            = true,
   $afs                       = false,
   $afs_cache_size            = 500000,
   $puppetmaster_server       = 'puppetmaster.openstack.org',
@@ -95,12 +94,6 @@ class openstack_project::template (
     install_users => $install_users
   }
 
-  if ($enable_unbound) {
-    class { 'unbound':
-      install_resolv_conf => $install_resolv_conf
-    }
-  }
-
   package { 'rsyslog':
     ensure => present,
   }