From b738e9ca7839772065f3db3ea29b057a7152eed5 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 8 Sep 2016 12:14:09 +0100
Subject: Convert AllNodesExtraConfig to support composable roles

This adjusts the interface to OS::TripleO::AllNodesExtraConfig so
it supports custom/composable/optional roles.

Note this does break backwards compatibility, and I can't see any way
to avoid that.  I've converted the in-tree templates, and we'll have
to document carefully and or provide a script (or automated conversion
via mistral perhaps?) to allow folks to easily adjust any out of tree
templates to the new format.

Basically you just have to:

1. Remove all the *_servers parameters, replace with one "servers"
   json parameter

2. Replace references to e.g "controller_servers" with "servers, Controller"
   which does a path-based lookup into the json map provided by overcloud.yaml

Change-Id: I5eebf853646b2f6300d6b542fcd4f43e82d3b413
Partially-Implements: blueprint custom-roles
---
 extraconfig/all_nodes/swap.yaml | 104 ----------------------------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 extraconfig/all_nodes/swap.yaml

(limited to 'extraconfig/all_nodes/swap.yaml')

diff --git a/extraconfig/all_nodes/swap.yaml b/extraconfig/all_nodes/swap.yaml
deleted file mode 100644
index 5383ffc9..00000000
--- a/extraconfig/all_nodes/swap.yaml
+++ /dev/null
@@ -1,104 +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_size_megabytes:
-    type: string
-    description: Amount of swap space to allocate in megabytes
-    default: '4096'
-  swap_path:
-    type: string
-    description: Full path to location of swap file
-    default: '/swap'
-
-
-resources:
-
-  SwapConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config: |
-        #!/bin/bash
-        set -eux
-        if [ ! -f $swap_path ]; then
-          dd if=/dev/zero of=$swap_path count=$swap_size_megabytes bs=1M
-          chmod 0600 $swap_path
-          mkswap $swap_path
-          swapon $swap_path
-        else
-          echo "$swap_path already exists"
-        fi
-        echo "$swap_path swap swap defaults 0 0" >> /etc/fstab
-      inputs:
-        - name: swap_size_megabytes
-          description: Amount of swap space to allocate in megabytes
-          default: '4096'
-        - name: swap_path
-          description: Full path to location of swap file
-          default: '/swap'
-
-  ControllerSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: controller_servers}
-      input_values:
-        swap_size_megabytes: {get_param: swap_size_megabytes}
-        swap_path: {get_param: swap_path}
-      actions: ["CREATE"]
-
-  ComputeSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: compute_servers}
-      input_values:
-        swap_size_megabytes: {get_param: swap_size_megabytes}
-        swap_path: {get_param: swap_path}
-      actions: ["CREATE"]
-
-  BlockStorageSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: blockstorage_servers}
-      input_values:
-        swap_size_megabytes: {get_param: swap_size_megabytes}
-        swap_path: {get_param: swap_path}
-      actions: ["CREATE"]
-
-  ObjectStorageSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: objectstorage_servers}
-      input_values:
-        swap_size_megabytes: {get_param: swap_size_megabytes}
-        swap_path: {get_param: swap_path}
-      actions: ["CREATE"]
-
-  CephStorageSwapDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      config: {get_resource: SwapConfig}
-      servers: {get_param: cephstorage_servers}
-      input_values:
-        swap_size_megabytes: {get_param: swap_size_megabytes}
-        swap_path: {get_param: swap_path}
-      actions: ["CREATE"]
-- 
cgit 1.2.3-korg