x/solar-resources
Code Issues Proposed changes

Remove enabled and manage_service for c-api

Browse Source 
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2015-07-22 15:28:45 +02:00
parent 4555c6b3a8
commit 00427f9aed
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/cinder_api_puppet/README.md
View File

@ -62,14 +62,6 @@ source https://github.com/openstack/puppet-cinder/blob/5.1.0/manifests/api.pp
(optional) The cinder api bind address (optional) The cinder api bind address
Defaults to 0.0.0.0 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`` ``ratelimits``
(optional) The state of the service (optional) The state of the service
Defaults to undef. If undefined the default ratelimiting values are used. Defaults to undef. If undefined the default ratelimiting values are used.

8
resources/cinder_api_puppet/actions/run.pp
View File

@ -1,7 +1,5 @@
$resource = hiera($::resource_name) $resource = hiera($::resource_name)
$ip = $resource['input']['ip']['value']
$keystone_password = $resource['input']['keystone_password']['value'] $keystone_password = $resource['input']['keystone_password']['value']
$keystone_enabled = $resource['input']['keystone_enabled']['value'] $keystone_enabled = $resource['input']['keystone_enabled']['value']
$keystone_tenant = $resource['input']['keystone_tenant']['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'] $service_workers = $resource['input']['service_workers']['value']
$package_ensure = $resource['input']['package_ensure']['value'] $package_ensure = $resource['input']['package_ensure']['value']
$bind_host = $resource['input']['bind_host']['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'] $ratelimits = $resource['input']['ratelimits']['value']
$default_volume_type = $resource['input']['default_volume_type']['value'] $default_volume_type = $resource['input']['default_volume_type']['value']
$ratelimits_factory = $resource['input']['ratelimits_factory']['value'] $ratelimits_factory = $resource['input']['ratelimits_factory']['value']
@ -46,8 +42,8 @@ class {'cinder::api':
service_workers => $service_workers, service_workers => $service_workers,
package_ensure => $package_ensure, package_ensure => $package_ensure,
bind_host => $bind_host, bind_host => $bind_host,
enabled => $enabled, enabled => true,
manage_service => $manage_service, manage_service => true,
ratelimits => $ratelimits, ratelimits => $ratelimits,
default_volume_type => $default_volume_type, default_volume_type => $default_volume_type,
ratelimits_factory => $ratelimits_factory, ratelimits_factory => $ratelimits_factory,

6
resources/cinder_api_puppet/meta.yaml
View File

@ -45,12 +45,6 @@ input:
bind_host: bind_host:
schema: str schema: str
value: '0.0.0.0' value: '0.0.0.0'
enabled:
schema: bool
value: true
manage_service:
schema: bool
value: true
ratelimits: ratelimits:
schema: str schema: str
value: '' value: ''