Merge "Convert AllNodesExtraConfig to support composable roles"

1 files changed, 0 insertions, 86 deletions

diff --git a/extraconfig/all_nodes/swap-partition.yaml b/extraconfig/all_nodes/swap-partition.yaml
deleted file mode 100644
index e6fa9eca..00000000
--- a/extraconfig/all_nodes/swap-partition.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Extra config to add swap space to nodes.
-
-# Parameters passed from the parent template - note if you maintain
-# out-of-tree templates they may require additional parameters if the
-# in-tree templates add a new role.
-parameters:
-  controller_servers:
-    type: json
-  compute_servers:
-    type: json
-  blockstorage_servers:
-    type: json
-  objectstorage_servers:
-    type: json
-  cephstorage_servers:
-    type: json
-  swap_partition_label:
-    type: string
-    description: Swap partition label
-    default: 'swap1'
-
-
-resources:
-
-  SwapConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config: |
-        #!/bin/bash
-        set -eux
-        swap_partition=$(realpath /dev/disk/by-label/$swap_partition_label)
-        swapon $swap_partition
-        echo "$swap_partition swap swap defaults 0 0" >> /etc/fstab
-      inputs:
-        - name: swap_partition_label
-          description: Swap partition label
-          default: 'swap1'
-
-  ControllerSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: controller_servers}
-      input_values:
-        swap_partition_label: {get_param: swap_partition_label}
-      actions: ["CREATE"]
-
-  ComputeSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: compute_servers}
-      input_values:
-        swap_partition_label: {get_param: swap_partition_label}
-      actions: ["CREATE"]
-
-  BlockStorageSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: blockstorage_servers}
-      input_values:
-        swap_partition_label: {get_param: swap_partition_label}
-      actions: ["CREATE"]
-
-  ObjectStorageSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: objectstorage_servers}
-      input_values:
-        swap_partition_label: {get_param: swap_partition_label}
-      actions: ["CREATE"]
-
-  CephStorageSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: cephstorage_servers}
-      input_values:
-        swap_partition_label: {get_param: swap_partition_label}
-      actions: ["CREATE"]