Merge "Move os-apply-config templates into a directory"

15 files changed, 15 insertions, 15 deletions

diff --git a/all-nodes-config.yaml b/os-apply-config/all-nodes-config.yaml
index 3f0bd61c..3f0bd61c 100644
--- a/all-nodes-config.yaml
+++ b/os-apply-config/all-nodes-config.yaml
diff --git a/ceph-cluster-config.yaml b/os-apply-config/ceph-cluster-config.yaml
index c3cf8e8a..c3cf8e8a 100644
--- a/ceph-cluster-config.yaml
+++ b/os-apply-config/ceph-cluster-config.yaml
diff --git a/ceph-storage-post.yaml b/os-apply-config/ceph-storage-post.yaml
index 734f90bd..734f90bd 100644
--- a/ceph-storage-post.yaml
+++ b/os-apply-config/ceph-storage-post.yaml
diff --git a/ceph-storage.yaml b/os-apply-config/ceph-storage.yaml
index 0dbcd3e7..0dbcd3e7 100644
--- a/ceph-storage.yaml
+++ b/os-apply-config/ceph-storage.yaml
diff --git a/cinder-storage-post.yaml b/os-apply-config/cinder-storage-post.yaml
index ad4e0460..ad4e0460 100644
--- a/cinder-storage-post.yaml
+++ b/os-apply-config/cinder-storage-post.yaml
diff --git a/cinder-storage.yaml b/os-apply-config/cinder-storage.yaml
index 7a686970..7a686970 100644
--- a/cinder-storage.yaml
+++ b/os-apply-config/cinder-storage.yaml
diff --git a/compute-post.yaml b/os-apply-config/compute-post.yaml
index 695690d4..695690d4 100644
--- a/compute-post.yaml
+++ b/os-apply-config/compute-post.yaml
diff --git a/compute.yaml b/os-apply-config/compute.yaml
index 88d4cb2b..88d4cb2b 100644
--- a/compute.yaml
+++ b/os-apply-config/compute.yaml
diff --git a/controller-post.yaml b/os-apply-config/controller-post.yaml
index aac96357..aac96357 100644
--- a/controller-post.yaml
+++ b/os-apply-config/controller-post.yaml
diff --git a/controller.yaml b/os-apply-config/controller.yaml
index 18dcc8eb..18dcc8eb 100644
--- a/controller.yaml
+++ b/os-apply-config/controller.yaml
diff --git a/swift-devices-and-proxy-config.yaml b/os-apply-config/swift-devices-and-proxy-config.yaml
index 4f01dbea..4f01dbea 100644
--- a/swift-devices-and-proxy-config.yaml
+++ b/os-apply-config/swift-devices-and-proxy-config.yaml
diff --git a/swift-storage-post.yaml b/os-apply-config/swift-storage-post.yaml
index 1b1c406d..1b1c406d 100644
--- a/swift-storage-post.yaml
+++ b/os-apply-config/swift-storage-post.yaml
diff --git a/swift-storage.yaml b/os-apply-config/swift-storage.yaml
index d62d7d1a..d62d7d1a 100644
--- a/swift-storage.yaml
+++ b/os-apply-config/swift-storage.yaml
diff --git a/vip-config.yaml b/os-apply-config/vip-config.yaml
index 8f984ab7..8f984ab7 100644
--- a/vip-config.yaml
+++ b/os-apply-config/vip-config.yaml
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index dd7e1a1c..d6eb97f9 100644
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -1,23 +1,23 @@
 resource_registry:
-  OS::TripleO::BlockStorage: cinder-storage.yaml
+  OS::TripleO::BlockStorage: os-apply-config/cinder-storage.yaml
   OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::Compute: compute.yaml
+  OS::TripleO::Compute: os-apply-config/compute.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: net-config-noop.yaml
   OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
-  OS::TripleO::Controller: controller.yaml
+  OS::TripleO::Controller: os-apply-config/controller.yaml
   OS::TripleO::Controller::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::ObjectStorage: swift-storage.yaml
+  OS::TripleO::ObjectStorage: os-apply-config/swift-storage.yaml
   OS::TripleO::ObjectStorage::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::CephStorage: ceph-storage.yaml
+  OS::TripleO::CephStorage: os-apply-config/ceph-storage.yaml
   OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::ControllerPostDeployment: controller-post.yaml
-  OS::TripleO::ComputePostDeployment: compute-post.yaml
-  OS::TripleO::ObjectStoragePostDeployment: swift-storage-post.yaml
-  OS::TripleO::BlockStoragePostDeployment: cinder-storage-post.yaml
-  OS::TripleO::CephStoragePostDeployment: ceph-storage-post.yaml
-  OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: swift-devices-and-proxy-config.yaml
-  OS::TripleO::CephClusterConfig::SoftwareConfig: ceph-cluster-config.yaml
-  OS::TripleO::AllNodes::SoftwareConfig: all-nodes-config.yaml
+  OS::TripleO::ControllerPostDeployment: os-apply-config/controller-post.yaml
+  OS::TripleO::ComputePostDeployment: os-apply-config/compute-post.yaml
+  OS::TripleO::ObjectStoragePostDeployment: os-apply-config/swift-storage-post.yaml
+  OS::TripleO::BlockStoragePostDeployment: os-apply-config/cinder-storage-post.yaml
+  OS::TripleO::CephStoragePostDeployment: os-apply-config/ceph-storage-post.yaml
+  OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: os-apply-config/swift-devices-and-proxy-config.yaml
+  OS::TripleO::CephClusterConfig::SoftwareConfig: os-apply-config/ceph-cluster-config.yaml
+  OS::TripleO::AllNodes::SoftwareConfig: os-apply-config/all-nodes-config.yaml
   OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml
   OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
   OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
@@ -31,7 +31,7 @@ resource_registry:
 
   # TripleO overcloud networks
   OS::TripleO::Network: network/networks.yaml
-  OS::TripleO::VipConfig: vip-config.yaml
+  OS::TripleO::VipConfig: os-apply-config/vip-config.yaml
 
   OS::TripleO::Network::External: network/noop.yaml
   OS::TripleO::Network::InternalApi: network/noop.yaml
@@ -73,4 +73,4 @@ resource_registry:
   OS::TripleO::Controller::Ports::RedisVipPort: network/ports/noop.yaml
 
   # validation resources
-  OS::TripleO::AllNodes::Validation: all-nodes-validation.yaml
+  OS::TripleO::AllNodes::Validation: os-apply-config/all-nodes-validation.yaml