aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-17 11:11:51 +0000
committerGerrit Code Review <review@openstack.org>2017-01-17 11:11:51 +0000
commit2e3ff0a6734bce712ab11f37a9dc2454f1420d76 (patch)
tree64ec94420d305ceae125f97825ccd99e1eb66f9f /puppet/manifests/overcloud_controller_pacemaker.pp
parent7ec199d64e2eb23b084f32bb42a1e8802fbf9931 (diff)
parent4b8720e6c1aa1d8e5a5163aefaccf5b78f48896b (diff)
Merge "Remove old ControllerConfig override from puppet-pacemaker.yaml"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp21
1 files changed, 0 insertions, 21 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
deleted file mode 100644
index d329d5fc..00000000
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ /dev/null
@@ -1,21 +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 hiera('step') >= 4 {
- hiera_include('controller_classes', [])
-}
-
-$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
-package_manifest{$package_manifest_name: ensure => present}