From fba215a69da02a97f5132671c43a2cc6a5a2c2d1 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 25 Nov 2015 11:17:14 -0500
Subject: Drop deprecated templates/Makefile/merge.py

This patch drops a bunch of deprecated stuff from
tripleo-heat-templates. Once we remove the Makefile
(which creates overcloud.yaml) we can proceed
in renaming overcloud-without-mergepy.yaml to
overcloud.yaml.

Change-Id: Ic6ab3777d19e207cae29dcbc2e3839815cd80181
---
 deprecated/block-storage.yaml | 92 -------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 deprecated/block-storage.yaml

(limited to 'deprecated/block-storage.yaml')

diff --git a/deprecated/block-storage.yaml b/deprecated/block-storage.yaml
deleted file mode 100644
index c288044a..00000000
--- a/deprecated/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}
-- 
cgit 1.2.3-korg