From 837643416d6fc636336d74b1da800a295c3d49a3 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 6 May 2016 19:38:29 +0200
Subject: Remove manage_service and enabled from TripleO manifests

These can be controlled via the specific Pacemaker role template.

Depends-On: I91a4267f0fc230f63df3333747d28463c7ae55fe
Change-Id: I8ef7bb94e048b998712b3534ceb51a7d10d016e9
---
 manifests/profile/base/glance/api.pp      | 13 -------------
 manifests/profile/base/glance/registry.pp | 13 -------------
 2 files changed, 26 deletions(-)

(limited to 'manifests/profile/base/glance')

diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 22b4dc9..ad59a38 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -18,14 +18,6 @@
 #
 # === Parameters
 #
-# [*manage_service*]
-#   (Optional) Whether to manage the glance service
-#   Defaults to undef
-#
-# [*enabled*]
-#   (Optional) Whether to enable the glance service
-#   Defaults to undef
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -36,8 +28,6 @@
 #   Defaults to downcase(hiera('glance_backend', 'swift'))
 #
 class tripleo::profile::base::glance::api (
-  $manage_service = undef,
-  $enabled        = undef,
   $step           = hiera('step'),
   $glance_backend = downcase(hiera('glance_backend', 'swift')),
 ) {
@@ -57,12 +47,9 @@ class tripleo::profile::base::glance::api (
     include ::glance::config
     class { '::glance::api':
       known_stores   => $glance_store,
-      manage_service => $manage_service,
-      enabled        => $enabled,
     }
     include ::glance::notify::rabbitmq
     include join(['::glance::backend::', $glance_backend])
   }
 
 }
-
diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp
index b77b356..774f646 100644
--- a/manifests/profile/base/glance/registry.pp
+++ b/manifests/profile/base/glance/registry.pp
@@ -22,14 +22,6 @@
 #   (Optional) Whether to run db sync
 #   Defaults to true
 #
-# [*manage_service*]
-#   (Optional) Whether to manage the glance service
-#   Defaults to undef
-#
-# [*enabled*]
-#   (Optional) Whether to enable the glance service
-#   Defaults to undef
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -41,8 +33,6 @@
 #
 class tripleo::profile::base::glance::registry (
   $sync_db        = true,
-  $manage_service = undef,
-  $enabled        = undef,
   $step           = hiera('step'),
   $glance_backend = downcase(hiera('glance_backend', 'swift')),
 ) {
@@ -57,12 +47,9 @@ class tripleo::profile::base::glance::registry (
     include ::glance::config
     class { '::glance::registry' :
       sync_db        => $sync_db,
-      manage_service => $manage_service,
-      enabled        => $enabled,
     }
     include ::glance::notify::rabbitmq
     include join(['::glance::backend::', $glance_backend])
   }
 
 }
-
-- 
cgit 1.2.3-korg