From 6b5ac01d2e61af9efddd01b58bfc0f6cd1e8518f Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 12 Feb 2015 14:34:16 -0500
Subject: Move all puppet templates into puppet directory.

This cleans up the top level tree by moving all the puppet
related bits into the puppet directory. The only exception
is overcloud-resource-registry-puppet.yaml which is
the puppet environment file and is used externally.

Change-Id: Idb65a7143b0f29e5579d4e9d1642e4cda6f65d50
---
 puppet/overcloud_volume.pp | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 puppet/overcloud_volume.pp

(limited to 'puppet/overcloud_volume.pp')

diff --git a/puppet/overcloud_volume.pp b/puppet/overcloud_volume.pp
deleted file mode 100644
index b433321a..00000000
--- a/puppet/overcloud_volume.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2015 Red Hat, Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-if str2bool(hiera('disable_package_install', 'false')) {
-  case $::osfamily {
-    'RedHat': {
-      Package { provider => 'norpm' } # provided by tripleo-puppet
-    }
-    default: {
-      warning('disable_package_install option not supported.')
-    }
-  }
-}
-
-if count(hiera('ntp::servers')) > 0 {
-  include ::ntp
-}
-
-include ::cinder
-include ::cinder::volume
-include ::cinder::volume::iscsi
-include ::cinder::setup_test_volume
-
-$snmpd_user = hiera('snmpd_readonly_user_name')
-snmp::snmpv3_user { $snmpd_user:
-  authtype => 'MD5',
-  authpass => hiera('snmpd_readonly_user_password'),
-}
-class { 'snmp':
-  agentaddress => ['udp:161','udp6:[::1]:161'],
-  snmpd_config => [ join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc  cron', 'includeAllDisks  10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ],
-}
-- 
cgit 1.2.3-korg