From e4c872e5bf4846502d2e212e776d7fd9710c67dd Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Thu, 27 Apr 2017 20:20:55 +0200
Subject: [PATCH] Move puppet repos to openstack_project::server

The zuul workers already have these repos installed by
install_puppet.sh (not for much longer but still).

Change-Id: I52bd7d48586492e8843b47bfb91043f28ea06b78
---
 modules/openstack_project/manifests/server.pp | 30 +++++++++++++++++
 .../openstack_project/manifests/template.pp   | 33 -------------------
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index dbdc6c100c..ba55a4d530 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -285,6 +285,36 @@ class openstack_project::server (
     }
   }
 
+  ###########################################################
+  # Set up puppet repos
+
+  if ($::osfamily == 'Debian') {
+    # NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
+    # anything greater will use the OS version of puppet.
+    if ($::operatingsystemrelease < '15.04') {
+      include ::apt
+      apt::source { 'puppetlabs':
+        location => 'http://apt.puppetlabs.com',
+        repos    => 'main',
+        key      => {
+          'id'     =>'47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+          'server' => 'pgp.mit.edu',
+        },
+      }
+    }
+  }
+
+  if ($::operatingsystem == 'CentOS') {
+    file { '/etc/yum.repos.d/puppetlabs.repo':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0444',
+      source  => 'puppet:///modules/openstack_project/centos7-puppetlabs.repo',
+      replace => true,
+    }
+  }
+
   class { 'openstack_project::template':
     certname                  => $certname,
     pin_puppet                => $pin_puppet,
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 14b4eb8ca1..d51e79a302 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -13,37 +13,4 @@ class openstack_project::template (
   $permit_root_login         = 'no',
 ) {
 
-  ###########################################################
-  # Classes for all hosts
-
-
-  if ($::osfamily == 'Debian') {
-    # NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
-    # anything greater will use the OS version of puppet.
-    if ($::operatingsystemrelease < '15.04') {
-      include ::apt
-      apt::source { 'puppetlabs':
-        location => 'http://apt.puppetlabs.com',
-        repos    => 'main',
-        key      => {
-          'id'     =>'47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
-          'server' => 'pgp.mit.edu',
-        },
-      }
-    }
-  }
-
-  if ($::operatingsystem == 'CentOS') {
-    file { '/etc/yum.repos.d/puppetlabs.repo':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      source  => 'puppet:///modules/openstack_project/centos7-puppetlabs.repo',
-      replace => true,
-    }
-  }
-
-  ###########################################################
-
 }