From 5a353c916cf4ed305c3ece8307fd1289630d17c3 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Sun, 19 Jul 2015 17:47:53 -0400 Subject: [PATCH] Rename -puppet.yaml templates. Updates the /puppet directory templates so that we drop the '-puppet' from the filenames. This is redundant because we already have puppet in the directory name and fixes inconsistencies where we aren't using -puppet in all the files within the puppet directory. Depends-On: I71cb07b2f5305aaf9c43ab175cca976e844b8175 Change-Id: I70d6e048a566666f5d6e5c2407f8a6b4fd9f6f87 --- environments/overcloud-steps.yaml | 2 +- overcloud-resource-registry-puppet.yaml | 16 ++++++++-------- ...h-storage-post-puppet.yaml => ceph-storage-post.yaml} | 0 puppet/{ceph-storage-puppet.yaml => ceph-storage.yaml} | 0 .../{cinder-storage-puppet.yaml => cinder-storage.yaml} | 0 puppet/{compute-post-puppet.yaml => compute-post.yaml} | 0 puppet/{compute-puppet.yaml => compute.yaml} | 0 ...{controller-post-puppet.yaml => controller-post.yaml} | 0 puppet/{controller-puppet.yaml => controller.yaml} | 0 puppet/{swift-storage-puppet.yaml => swift-storage.yaml} | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename puppet/{ceph-storage-post-puppet.yaml => ceph-storage-post.yaml} (100%) rename puppet/{ceph-storage-puppet.yaml => ceph-storage.yaml} (100%) rename puppet/{cinder-storage-puppet.yaml => cinder-storage.yaml} (100%) rename puppet/{compute-post-puppet.yaml => compute-post.yaml} (100%) rename puppet/{compute-puppet.yaml => compute.yaml} (100%) rename puppet/{controller-post-puppet.yaml => controller-post.yaml} (100%) rename puppet/{controller-puppet.yaml => controller.yaml} (100%) rename puppet/{swift-storage-puppet.yaml => swift-storage.yaml} (100%) diff --git a/environments/overcloud-steps.yaml b/environments/overcloud-steps.yaml index 99f73688..f61cbb6f 100644 --- a/environments/overcloud-steps.yaml +++ b/environments/overcloud-steps.yaml @@ -1,7 +1,7 @@ # Specifies hooks/breakpoints where overcloud deployment should stop # Allows operator validation between steps, and/or more granular control. # Note: the wildcards relate to naming convention for some resource suffixes, -# e.g see puppet/*-post-puppet.yaml, enabling this will mean we wait for +# e.g see puppet/*-post.yaml, enabling this will mean we wait for # a user signal on every *Deployment_StepN resource defined in those files. resource_registry: resources: diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index cdf626ea..c5e5fdea 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -1,22 +1,22 @@ resource_registry: - OS::TripleO::BlockStorage: puppet/cinder-storage-puppet.yaml + OS::TripleO::BlockStorage: puppet/cinder-storage.yaml OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml - OS::TripleO::Compute: puppet/compute-puppet.yaml + OS::TripleO::Compute: puppet/compute.yaml OS::TripleO::Compute::Net::SoftwareConfig: net-config-noop.yaml OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment - OS::TripleO::Controller: puppet/controller-puppet.yaml + OS::TripleO::Controller: puppet/controller.yaml OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml - OS::TripleO::ObjectStorage: puppet/swift-storage-puppet.yaml + OS::TripleO::ObjectStorage: puppet/swift-storage.yaml OS::TripleO::ObjectStorage::Net::SoftwareConfig: net-config-noop.yaml - OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml + OS::TripleO::CephStorage: puppet/ceph-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml - OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml + OS::TripleO::ControllerPostDeployment: puppet/controller-post.yaml # set to controller-config-pacemaker.yaml to enable pacemaker OS::TripleO::ControllerConfig: puppet/controller-config.yaml - OS::TripleO::ComputePostDeployment: puppet/compute-post-puppet.yaml + OS::TripleO::ComputePostDeployment: puppet/compute-post.yaml OS::TripleO::ObjectStoragePostDeployment: puppet/swift-storage-post.yaml OS::TripleO::BlockStoragePostDeployment: puppet/cinder-storage-post.yaml - OS::TripleO::CephStoragePostDeployment: puppet/ceph-storage-post-puppet.yaml + OS::TripleO::CephStoragePostDeployment: puppet/ceph-storage-post.yaml OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml OS::TripleO::CephClusterConfig::SoftwareConfig: puppet/ceph-cluster-config.yaml OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml diff --git a/puppet/ceph-storage-post-puppet.yaml b/puppet/ceph-storage-post.yaml similarity index 100% rename from puppet/ceph-storage-post-puppet.yaml rename to puppet/ceph-storage-post.yaml diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage.yaml similarity index 100% rename from puppet/ceph-storage-puppet.yaml rename to puppet/ceph-storage.yaml diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage.yaml similarity index 100% rename from puppet/cinder-storage-puppet.yaml rename to puppet/cinder-storage.yaml diff --git a/puppet/compute-post-puppet.yaml b/puppet/compute-post.yaml similarity index 100% rename from puppet/compute-post-puppet.yaml rename to puppet/compute-post.yaml diff --git a/puppet/compute-puppet.yaml b/puppet/compute.yaml similarity index 100% rename from puppet/compute-puppet.yaml rename to puppet/compute.yaml diff --git a/puppet/controller-post-puppet.yaml b/puppet/controller-post.yaml similarity index 100% rename from puppet/controller-post-puppet.yaml rename to puppet/controller-post.yaml diff --git a/puppet/controller-puppet.yaml b/puppet/controller.yaml similarity index 100% rename from puppet/controller-puppet.yaml rename to puppet/controller.yaml diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage.yaml similarity index 100% rename from puppet/swift-storage-puppet.yaml rename to puppet/swift-storage.yaml -- 2.16.6