aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-07-19 17:47:53 -0400
committerDan Prince <dprince@redhat.com>2015-09-22 08:30:01 -0400
commit5a353c916cf4ed305c3ece8307fd1289630d17c3 (patch)
treedbc4b5229e38196b9b49642f7dc1d9c6e5f5f6f7
parent8e7a13ebe898a9f6a94bf77d095a681ec744e719 (diff)
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
-rw-r--r--environments/overcloud-steps.yaml2
-rw-r--r--overcloud-resource-registry-puppet.yaml16
-rw-r--r--puppet/ceph-storage-post.yaml (renamed from puppet/ceph-storage-post-puppet.yaml)0
-rw-r--r--puppet/ceph-storage.yaml (renamed from puppet/ceph-storage-puppet.yaml)0
-rw-r--r--puppet/cinder-storage.yaml (renamed from puppet/cinder-storage-puppet.yaml)0
-rw-r--r--puppet/compute-post.yaml (renamed from puppet/compute-post-puppet.yaml)0
-rw-r--r--puppet/compute.yaml (renamed from puppet/compute-puppet.yaml)0
-rw-r--r--puppet/controller-post.yaml (renamed from puppet/controller-post-puppet.yaml)0
-rw-r--r--puppet/controller.yaml (renamed from puppet/controller-puppet.yaml)0
-rw-r--r--puppet/swift-storage.yaml (renamed from puppet/swift-storage-puppet.yaml)0
10 files changed, 9 insertions, 9 deletions
diff --git a/environments/overcloud-steps.yaml b/environments/overcloud-steps.yaml
index 99f7368..f61cbb6 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 cdf626e..c5e5fde 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
index 1b5b944..1b5b944 100644
--- a/puppet/ceph-storage-post-puppet.yaml
+++ b/puppet/ceph-storage-post.yaml
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage.yaml
index 4b4c76f..4b4c76f 100644
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage.yaml
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage.yaml
index f597512..f597512 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage.yaml
diff --git a/puppet/compute-post-puppet.yaml b/puppet/compute-post.yaml
index b4a6126..b4a6126 100644
--- a/puppet/compute-post-puppet.yaml
+++ b/puppet/compute-post.yaml
diff --git a/puppet/compute-puppet.yaml b/puppet/compute.yaml
index 3f73099..3f73099 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute.yaml
diff --git a/puppet/controller-post-puppet.yaml b/puppet/controller-post.yaml
index 49cbe1e..49cbe1e 100644
--- a/puppet/controller-post-puppet.yaml
+++ b/puppet/controller-post.yaml
diff --git a/puppet/controller-puppet.yaml b/puppet/controller.yaml
index 084fe3d..084fe3d 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller.yaml
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage.yaml
index 6761777..6761777 100644
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage.yaml