summaryrefslogtreecommitdiffstats
path: root/block-storage.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-23 14:22:12 -0500
committerDan Prince <dprince@redhat.com>2015-02-23 20:50:59 -0500
commitc82b6cec10e1b411774d2f4d5d51565ba7c3550c (patch)
treee80a999cba61fb0d75fc847c031a112195b236d2 /block-storage.yaml
parent112a42f34d4384eab729f039ad60b88cc714d09b (diff)
Deprecate the old mergepy overcloud templates
This patch moves all the related mergepy templates for the overcloud into a deprecated directory. The Makefile has been updated so that overcloud.yaml is still generated at the top level so this shouldn't break end users. This is to reduce confusion for new users who are learning the TripleO heat templates and find the fact that we have two full implementations very confusing. Change-Id: I0848aca4dee3e37cb4c6089c5f655ad22ac6c5fd
Diffstat (limited to 'block-storage.yaml')
-rw-r--r--block-storage.yaml92
1 files changed, 0 insertions, 92 deletions
diff --git a/block-storage.yaml b/block-storage.yaml
deleted file mode 100644
index c288044a..00000000
--- a/block-storage.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-heat_template_version: 2013-05-23
-description: 'Common Block Storage Configuration'
-parameters:
- BlockStorageImage:
- type: string
- default: overcloud-cinder-volume
- OvercloudBlockStorageFlavor:
- description: Flavor for block storage nodes to request when deploying.
- type: string
- constraints:
- - custom_constraint: nova.flavor
- BlockStorageExtraConfig:
- default: {}
- description: |
- Controller specific configuration to inject into the cluster. Same
- structure as ExtraConfig.
- type: json
-resources:
- BlockStorage0:
- type: OS::Nova::Server
- properties:
- image:
- {get_param: BlockStorageImage}
- flavor: {get_param: OvercloudBlockStorageFlavor}
- key_name: {get_param: KeyName}
- user_data_format: SOFTWARE_CONFIG
- BlockStorage0AllNodesDeployment:
- depends_on: [BlockStorage0Deployment,BlockStorage0PassthroughSpecific]
- type: OS::Heat::StructuredDeployment
- properties:
- signal_transport: {get_param: DefaultSignalTransport}
- config: {get_resource: allNodesConfig}
- server: {get_resource: BlockStorage0}
- BlockStorage0Deployment:
- type: OS::Heat::StructuredDeployment
- properties:
- server: {get_resource: BlockStorage0}
- config: {get_resource: BlockStorageConfig}
- input_values:
- controller_virtual_ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
- cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]}
- signal_transport: NO_SIGNAL
- BlockStorage0Passthrough:
- type: OS::Heat::StructuredDeployment
- properties:
- config: {get_resource: BlockStoragePassthrough}
- server: {get_resource: BlockStorage0}
- signal_transport: NO_SIGNAL
- input_values:
- passthrough_config: {get_param: ExtraConfig}
- BlockStorage0PassthroughSpecific:
- depends_on: [BlockStorage0Passthrough]
- type: OS::Heat::StructuredDeployment
- properties:
- config: {get_resource: BlockStoragePassthroughSpecific}
- server: {get_resource: BlockStorage0}
- signal_transport: NO_SIGNAL
- input_values:
- passthrough_config_specific: {get_param: BlockStorageExtraConfig}
- BlockStorageConfig:
- type: OS::Heat::StructuredConfig
- properties:
- group: os-apply-config
- config:
- admin-password: {get_param: AdminPassword}
- keystone:
- host: {get_input: controller_virtual_ip}
- cinder:
- db: {get_input: cinder_dsn}
- volume_size_mb:
- get_param: CinderLVMLoopDeviceSize
- service-password:
- get_param: CinderPassword
- iscsi-helper:
- get_param: CinderISCSIHelper
- rabbit:
- host: {get_input: controller_virtual_ip}
- username: {get_param: RabbitUserName}
- password: {get_param: RabbitPassword}
- glance:
- host: {get_input: controller_virtual_ip}
- port: {get_param: GlancePort}
- BlockStoragePassthrough:
- type: OS::Heat::StructuredConfig
- properties:
- group: os-apply-config
- config: {get_input: passthrough_config}
- BlockStoragePassthroughSpecific:
- type: OS::Heat::StructuredConfig
- properties:
- group: os-apply-config
- config: {get_input: passthrough_config_specific}