From f35d1e2569e110739af8d1103effcaa0bd3b3b4a Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 22 Jul 2015 15:30:45 +0200 Subject: [PATCH] Remove enabled and manage_service for c-scheduler Signed-off-by: Bogdan Dobrelya --- resources/cinder_scheduler_puppet/README.md | 2 +- resources/cinder_scheduler_puppet/actions/run.pp | 6 ++---- resources/cinder_scheduler_puppet/meta.yaml | 6 ------ resources/cinder_scheduler_puppet/test.py | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/resources/cinder_scheduler_puppet/README.md b/resources/cinder_scheduler_puppet/README.md index e7aee31..fc64071 100644 --- a/resources/cinder_scheduler_puppet/README.md +++ b/resources/cinder_scheduler_puppet/README.md @@ -1,3 +1,3 @@ -# Cinder API resource for puppet handler +# Cinder Scheduler resource for puppet handler Setup and configure the cinder scheduler service diff --git a/resources/cinder_scheduler_puppet/actions/run.pp b/resources/cinder_scheduler_puppet/actions/run.pp index f7294cf..0413a38 100644 --- a/resources/cinder_scheduler_puppet/actions/run.pp +++ b/resources/cinder_scheduler_puppet/actions/run.pp @@ -2,8 +2,6 @@ $resource = hiera($::resource_name) $scheduler_driver = $resource['input']['scheduler_driver']['value'] $package_ensure = $resource['input']['package_ensure']['value'] -$enabled = $resource['input']['enabled']['value'] -$manage_service = $resource['input']['manage_service']['value'] include cinder::params @@ -15,6 +13,6 @@ package { 'cinder': class {'cinder::scheduler': scheduler_driver => $scheduler_driver, package_ensure => $package_ensure, -enabled => $enabled, -manage_service => $manage_service, +enabled => true, +manage_service => true, } diff --git a/resources/cinder_scheduler_puppet/meta.yaml b/resources/cinder_scheduler_puppet/meta.yaml index 0f5c461..5a7ce2b 100644 --- a/resources/cinder_scheduler_puppet/meta.yaml +++ b/resources/cinder_scheduler_puppet/meta.yaml @@ -9,12 +9,6 @@ input: package_ensure: schema: str value: 'present' - enabled: - schema: bool - value: true - manage_service: - schema: bool - value: true git: schema: {repository: str!, branch: str!} diff --git a/resources/cinder_scheduler_puppet/test.py b/resources/cinder_scheduler_puppet/test.py index 23ebe3a..045d5ed 100644 --- a/resources/cinder_scheduler_puppet/test.py +++ b/resources/cinder_scheduler_puppet/test.py @@ -9,4 +9,4 @@ def test(resource): # 'http://%s:%s' % (resource.args['ip'].value, resource.args['port'].value) # TODO(bogdando) figure out how to test this # http://docs.openstack.org/developer/nova/devref/scheduler.html - ) +# )