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
This commit is contained in:
Giulio Fidente 2017-05-26 00:53:58 +02:00
parent dfd4e12b22
commit 43edc49a04
3 changed files with 13 additions and 48 deletions

View File

@ -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]}

View File

@ -27,20 +27,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
@ -76,16 +65,6 @@ parameters:
clients using older Ceph servers.
type: string
conditions:
glance_multiple_locations:
and:
- equals:
- get_param: GlanceBackend
- rbd
- equals:
- get_param: NovaEnableRbdBackend
- true
outputs:
role_data:
description: Role data for the Ceph External service.
@ -122,8 +101,5 @@ outputs:
- ceph-base
- ceph-mon
- ceph-osd
service_config_settings:
glance_api:
glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
step_config: |
include ::tripleo::profile::base::ceph::client

View File

@ -96,6 +96,10 @@ parameters:
GlanceRbdPoolName:
default: images
type: string
NovaEnableRbdBackend:
default: false
description: Whether to enable or not the Rbd backend for Nova
type: boolean
RabbitPassword:
description: The password for RabbitMQ
type: string
@ -129,6 +133,14 @@ conditions:
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']}
service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
glance_multiple_locations:
and:
- equals:
- get_param: GlanceBackend
- rbd
- equals:
- get_param: NovaEnableRbdBackend
- true
resources:
@ -187,6 +199,7 @@ outputs:
glance::keystone::authtoken::project_domain_name: 'Default'
glance::api::pipeline: 'keystone'
glance::api::show_image_direct_url: true
glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
# NOTE: bind IP is found in Heat replacing the network name with the
# local node IP for the given network; replacement examples
# (eg. for internal_api):