From 00427f9aedd749d82feb6db15d78b4345ad90e5f Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 22 Jul 2015 15:28:45 +0200 Subject: [PATCH] Remove enabled and manage_service for c-api Signed-off-by: Bogdan Dobrelya --- resources/cinder_api_puppet/README.md | 8 -------- resources/cinder_api_puppet/actions/run.pp | 8 ++------ resources/cinder_api_puppet/meta.yaml | 6 ------ 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/resources/cinder_api_puppet/README.md b/resources/cinder_api_puppet/README.md index dc5b2bb..177e119 100644 --- a/resources/cinder_api_puppet/README.md +++ b/resources/cinder_api_puppet/README.md @@ -62,14 +62,6 @@ source https://github.com/openstack/puppet-cinder/blob/5.1.0/manifests/api.pp (optional) The cinder api bind address Defaults to 0.0.0.0 - ``enabled`` - (optional) The state of the service - Defaults to true - - ``manage_service`` - (optional) Whether to start/stop the service - Defaults to true - ``ratelimits`` (optional) The state of the service Defaults to undef. If undefined the default ratelimiting values are used. diff --git a/resources/cinder_api_puppet/actions/run.pp b/resources/cinder_api_puppet/actions/run.pp index a5e2eb1..857cbca 100644 --- a/resources/cinder_api_puppet/actions/run.pp +++ b/resources/cinder_api_puppet/actions/run.pp @@ -1,7 +1,5 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] - $keystone_password = $resource['input']['keystone_password']['value'] $keystone_enabled = $resource['input']['keystone_enabled']['value'] $keystone_tenant = $resource['input']['keystone_tenant']['value'] @@ -16,8 +14,6 @@ $service_port = $resource['input']['service_port']['value'] $service_workers = $resource['input']['service_workers']['value'] $package_ensure = $resource['input']['package_ensure']['value'] $bind_host = $resource['input']['bind_host']['value'] -$enabled = $resource['input']['enabled']['value'] -$manage_service = $resource['input']['manage_service']['value'] $ratelimits = $resource['input']['ratelimits']['value'] $default_volume_type = $resource['input']['default_volume_type']['value'] $ratelimits_factory = $resource['input']['ratelimits_factory']['value'] @@ -46,8 +42,8 @@ class {'cinder::api': service_workers => $service_workers, package_ensure => $package_ensure, bind_host => $bind_host, - enabled => $enabled, - manage_service => $manage_service, + enabled => true, + manage_service => true, ratelimits => $ratelimits, default_volume_type => $default_volume_type, ratelimits_factory => $ratelimits_factory, diff --git a/resources/cinder_api_puppet/meta.yaml b/resources/cinder_api_puppet/meta.yaml index e2cdcfd..6164176 100644 --- a/resources/cinder_api_puppet/meta.yaml +++ b/resources/cinder_api_puppet/meta.yaml @@ -45,12 +45,6 @@ input: bind_host: schema: str value: '0.0.0.0' - enabled: - schema: bool - value: true - manage_service: - schema: bool - value: true ratelimits: schema: str value: ''