From 0fe57bd954f7e29e2d5e7813cdd016db399c7ef7 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Thu, 27 Apr 2017 20:23:21 +0200
Subject: [PATCH] Remove empty template class
Change-Id: I7d9e68e3a879e52b10fa6a70cb5fb38d41db427f
---
modules/openstack_project/manifests/afsfs.pp | 1 -
modules/openstack_project/manifests/server.pp | 9 ---------
.../manifests/single_use_slave.pp | 4 ----
modules/openstack_project/manifests/template.pp | 16 ----------------
4 files changed, 30 deletions(-)
delete mode 100644 modules/openstack_project/manifests/template.pp
diff --git a/modules/openstack_project/manifests/afsfs.pp b/modules/openstack_project/manifests/afsfs.pp
index 52dbcf6a0f..c5ef88a922 100644
--- a/modules/openstack_project/manifests/afsfs.pp
+++ b/modules/openstack_project/manifests/afsfs.pp
@@ -15,6 +15,5 @@ class openstack_project::afsfs (
ip => '23.253.200.228',
},
],
- require => Class['Openstack_project::Template'],
}
}
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index ba55a4d530..cc6509037d 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -315,13 +315,4 @@ class openstack_project::server (
}
}
- class { 'openstack_project::template':
- certname => $certname,
- pin_puppet => $pin_puppet,
- ca_server => $ca_server,
- puppetmaster_server => $puppetmaster_server,
- afs => $afs,
- sysadmins => $sysadmins,
- }
-
}
diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp
index f3ff331a2b..e4d010cde7 100644
--- a/modules/openstack_project/manifests/single_use_slave.pp
+++ b/modules/openstack_project/manifests/single_use_slave.pp
@@ -12,8 +12,4 @@ class openstack_project::single_use_slave (
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
) inherits openstack_project {
- class { 'openstack_project::template':
- certname => $certname,
- install_resolv_conf => $install_resolv_conf,
- }
}
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
deleted file mode 100644
index d51e79a302..0000000000
--- a/modules/openstack_project/manifests/template.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Class: openstack_project::template
-#
-# A template host with no running services
-#
-class openstack_project::template (
- $pin_puppet = '3.',
- $install_resolv_conf = true,
- $certname = $::fqdn,
- $ca_server = undef,
- $afs = false,
- $puppetmaster_server = 'puppetmaster.openstack.org',
- $sysadmins = [],
- $permit_root_login = 'no',
-) {
-
-}