diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-11-13 17:53:30 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-11-13 17:53:30 +0000 |
commit | af8dd8bbe74ca5f756d259a75bc867a51e8fa424 (patch) | |
tree | 872e8567797348c1d842d23ee62074f172dca931 /puppet/cinder-storage.yaml | |
parent | 4255cfce520ae0be8634a08dbe51b53e849dd5e3 (diff) | |
parent | ce309763c6da3c50d613ee243d98c215b3a13465 (diff) |
Merge "Refacter Endpoints into EndpointMap"
Diffstat (limited to 'puppet/cinder-storage.yaml')
-rw-r--r-- | puppet/cinder-storage.yaml | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 239c2026..b536418d 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -44,14 +44,6 @@ parameters: type: string constraints: - custom_constraint: nova.flavor - GlancePort: - default: "9292" - description: Glance port. - type: string - GlanceProtocol: - default: http - description: Protocol to use when connecting to glance, set to https for SSL. - type: string KeyName: default: default description: Name of an existing EC2 KeyPair to enable SSH access to the instances @@ -104,6 +96,11 @@ parameters: description: Mapping of service_name -> network name. Typically set via parameter_defaults in the resource registry. type: json + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json GlanceApiVirtualIP: type: string default: '' @@ -201,14 +198,7 @@ resources: cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend} cinder_iscsi_helper: {get_param: CinderISCSIHelper} cinder_iscsi_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} - glance_api_servers: - list_join: - - '' - - - {get_param: GlanceProtocol} - - '://' - - {get_param: GlanceApiVirtualIP} - - ':' - - {get_param: GlancePort} + glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} |