From 54a0286106e716250231dbd80e467dbe85a160a5 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Mon, 5 Sep 2016 18:40:35 +0100
Subject: Move role deployment steps into puppet/post.yaml

To enable steps to be aligned between roles, we need to define
dependencies between the steps, which is only possible if we
move the steps out of distinct nested stacks so we can use
depends_on to serialized the steps for all roles.

Note that we may be able to further refactor later to remove the
per-role -config.yaml nested stacks as well.

Change-Id: Ia2ea559e8eeb64763908f75705e3728ee90b5744
Partially-Implements: blueprint custom-roles
---
 puppet/cinder-storage-post.yaml | 91 -----------------------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 puppet/cinder-storage-post.yaml

(limited to 'puppet/cinder-storage-post.yaml')

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
deleted file mode 100644
index 0620bc6c..00000000
--- a/puppet/cinder-storage-post.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-heat_template_version: 2015-04-30
-description: 'OpenStack cinder storage post deployment for Puppet'
-
-parameters:
-  ConfigDebug:
-    default: false
-    description: Whether to run config management (e.g. Puppet) in debug mode.
-    type: boolean
-  servers:
-    type: json
-  DeployIdentifier:
-     type: string
-     default: ''
-     description: Value which changes if the node configuration may need to be re-applied
-  RoleData:
-    type: json
-    default: {}
-
-resources:
-
-  VolumeArtifactsConfig:
-    type: deploy-artifacts.yaml
-
-  VolumeArtifactsDeploy:
-    type: OS::Heat::StructuredDeployments
-    properties:
-      servers:  {get_param: servers}
-      config: {get_resource: VolumeArtifactsConfig}
-      input_values:
-        update_identifier: {get_param: DeployIdentifier}
-
-  VolumePuppetConfig:
-    type: OS::Heat::SoftwareConfig
-    depends_on: VolumeArtifactsDeploy
-    properties:
-      group: puppet
-      options:
-        enable_debug: {get_param: ConfigDebug}
-        enable_hiera: True
-        enable_facter: False
-        modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
-      inputs:
-      - name: step
-      outputs:
-      - name: result
-      config:
-        list_join:
-        - ''
-        - - get_file: manifests/overcloud_volume.pp
-          - {get_param: [RoleData, step_config]}
-
-  VolumeDeployment_Step2:
-    type: OS::Heat::StructuredDeployments
-    depends_on: VolumeArtifactsDeploy
-    properties:
-      name: VolumeDeployment_Step2
-      servers:  {get_param: servers}
-      config: {get_resource: VolumePuppetConfig}
-      input_values:
-        step: 2
-        update_identifier: {get_param: DeployIdentifier}
-
-  VolumeDeployment_Step3:
-    type: OS::Heat::StructuredDeployments
-    depends_on: VolumeDeployment_Step2
-    properties:
-      name: VolumeDeployment_Step3
-      servers:  {get_param: servers}
-      config: {get_resource: VolumePuppetConfig}
-      input_values:
-        step: 3
-        update_identifier: {get_param: DeployIdentifier}
-
-  VolumeDeployment_Step4:
-    type: OS::Heat::StructuredDeployments
-    depends_on: VolumeDeployment_Step3
-    properties:
-      name: VolumeDeployment_Step4
-      servers:  {get_param: servers}
-      config: {get_resource: VolumePuppetConfig}
-      input_values:
-        step: 4
-        update_identifier: {get_param: DeployIdentifier}
-
-  # Note, this should come last, so use depends_on to ensure
-  # this is created after any other resources.
-  ExtraConfig:
-    depends_on: VolumeDeployment_Step4
-    type: OS::TripleO::NodeExtraConfigPost
-    properties:
-        servers: {get_param: servers}
-- 
cgit 1.2.3-korg