From 43edc49a04dd1ed64bbe258593dffe3640c2874e Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 26 May 2017 00:53:58 +0200 Subject: Move glance::api::show_multiple_locations within GlanceApi Previously we were setting glance::api::show_multiple_locations from the CephBase resource but this seems unnecessary as the GlanceApi resource can consume the parameters needed to set the value. Change-Id: I0a7d8cb19a86b96d6196dad453970b4e56c5fe7e --- puppet/services/ceph-base.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'puppet/services/ceph-base.yaml') diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index e12c55eb..48d95993 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -29,20 +29,9 @@ parameters: GlanceRbdPoolName: default: images type: string - GlanceBackend: - default: swift - description: The short name of the Glance backend to use. Should be one - of swift, rbd, or file - type: string - constraints: - - allowed_values: ['swift', 'file', 'rbd'] GnocchiRbdPoolName: default: metrics type: string - NovaEnableRbdBackend: - default: false - description: Whether to enable or not the Rbd backend for Nova - type: boolean NovaRbdPoolName: default: vms type: string @@ -82,16 +71,6 @@ parameter_groups: parameters: - ControllerEnableCephStorage -conditions: - glance_multiple_locations: - and: - - equals: - - get_param: GlanceBackend - - rbd - - equals: - - get_param: NovaEnableRbdBackend - - true - outputs: role_data: description: Role data for the Ceph base service. @@ -153,6 +132,3 @@ outputs: - keys: CEPH_CLIENT_KEY: list_join: ['.', ['client', {get_param: CephClientUserName}]] - service_config_settings: - glance_api: - glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]} -- cgit 1.2.3-korg