From 4b3f883c4c64f1105845b1ae618a351cef1db620 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Tue, 4 Aug 2015 13:44:08 +0200 Subject: [PATCH] Decompose glance_api_servicers input Because of existing limitations for resource inputs connections, the glance_api_servicers upstream parameter was decomposed to host and port. Signed-off-by: Bogdan Dobrelya --- resources/cinder_glance_puppet/README.md | 2 ++ resources/cinder_glance_puppet/actions/run.pp | 1 - resources/cinder_glance_puppet/meta.yaml | 3 --- resources/cinder_scheduler_puppet/actions/run.pp | 8 ++++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/resources/cinder_glance_puppet/README.md b/resources/cinder_glance_puppet/README.md index 71d30df..96da42a 100644 --- a/resources/cinder_glance_puppet/README.md +++ b/resources/cinder_glance_puppet/README.md @@ -10,6 +10,8 @@ source https://github.com/openstack/puppet-cinder/blob/5.1.0/manifests/glance.pp (optional) A list of the glance api servers available to cinder. Should be an array with [hostname|ip]:port Defaults to undef + Note: for this resource, it is decomposed to *_host and *_port due to + existing implementation limitations ``glance_api_version`` (optional) Glance API version. diff --git a/resources/cinder_glance_puppet/actions/run.pp b/resources/cinder_glance_puppet/actions/run.pp index eec668b..c5b030d 100644 --- a/resources/cinder_glance_puppet/actions/run.pp +++ b/resources/cinder_glance_puppet/actions/run.pp @@ -1,6 +1,5 @@ $resource = hiera($::resource_name) -$glance_api_servers = $resource['input']['glance_api_servers']['value'] $glance_api_version = $resource['input']['glance_api_version']['value'] $glance_num_retries = $resource['input']['glance_num_retries']['value'] $glance_api_insecure = $resource['input']['glance_api_insecure']['value'] diff --git a/resources/cinder_glance_puppet/meta.yaml b/resources/cinder_glance_puppet/meta.yaml index 8457e7b..8d6a52b 100644 --- a/resources/cinder_glance_puppet/meta.yaml +++ b/resources/cinder_glance_puppet/meta.yaml @@ -3,9 +3,6 @@ handler: puppet puppet_module: cinder version: 1.0.0 input: - glance_api_servers: - schema: str - value: '' glance_api_version: schema: int value: 2 diff --git a/resources/cinder_scheduler_puppet/actions/run.pp b/resources/cinder_scheduler_puppet/actions/run.pp index 0413a38..5d963a6 100644 --- a/resources/cinder_scheduler_puppet/actions/run.pp +++ b/resources/cinder_scheduler_puppet/actions/run.pp @@ -11,8 +11,8 @@ package { 'cinder': } -> class {'cinder::scheduler': -scheduler_driver => $scheduler_driver, -package_ensure => $package_ensure, -enabled => true, -manage_service => true, + scheduler_driver => $scheduler_driver, + package_ensure => $package_ensure, + enabled => true, + manage_service => true, }