Browse Source

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
changes/52/203452/10
Dan Prince 6 years ago
parent
commit
5a353c916c
  1. 2
      environments/overcloud-steps.yaml
  2. 16
      overcloud-resource-registry-puppet.yaml
  3. 0
      puppet/ceph-storage-post.yaml
  4. 0
      puppet/ceph-storage.yaml
  5. 0
      puppet/cinder-storage.yaml
  6. 0
      puppet/compute-post.yaml
  7. 0
      puppet/compute.yaml
  8. 0
      puppet/controller-post.yaml
  9. 0
      puppet/controller.yaml
  10. 0
      puppet/swift-storage.yaml

2
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:

16
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

0
puppet/ceph-storage-post-puppet.yaml → puppet/ceph-storage-post.yaml

0
puppet/ceph-storage-puppet.yaml → puppet/ceph-storage.yaml

0
puppet/cinder-storage-puppet.yaml → puppet/cinder-storage.yaml

0
puppet/compute-post-puppet.yaml → puppet/compute-post.yaml

0
puppet/compute-puppet.yaml → puppet/compute.yaml

0
puppet/controller-post-puppet.yaml → puppet/controller-post.yaml

0
puppet/controller-puppet.yaml → puppet/controller.yaml

0
puppet/swift-storage-puppet.yaml → puppet/swift-storage.yaml

Loading…
Cancel
Save