diff options
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 10 | ||||
| -rw-r--r-- | puppet/ceph-storage-puppet.yaml (renamed from ceph-storage-puppet.yaml) | 0 | ||||
| -rw-r--r-- | puppet/cinder-storage-puppet.yaml (renamed from cinder-storage-puppet.yaml) | 6 | ||||
| -rw-r--r-- | puppet/compute-puppet.yaml (renamed from compute-puppet.yaml) | 6 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml (renamed from controller-puppet.yaml) | 12 | ||||
| -rw-r--r-- | puppet/manifests/loadbalancer.pp (renamed from puppet/loadbalancer.pp) | 0 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp (renamed from puppet/overcloud_compute.pp) | 0 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp (renamed from puppet/overcloud_controller.pp) | 0 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_object.pp (renamed from puppet/overcloud_object.pp) | 0 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_volume.pp (renamed from puppet/overcloud_volume.pp) | 0 | ||||
| -rw-r--r-- | puppet/manifests/ringbuilder.pp (renamed from puppet/ringbuilder.pp) | 0 | ||||
| -rw-r--r-- | puppet/swift-storage-puppet.yaml (renamed from swift-storage-puppet.yaml) | 8 |
12 files changed, 21 insertions, 21 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index f7b237c8..1068e6eb 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -1,11 +1,11 @@ resource_registry: - OS::TripleO::BlockStorage: cinder-storage-puppet.yaml - OS::TripleO::Compute: compute-puppet.yaml + OS::TripleO::BlockStorage: puppet/cinder-storage-puppet.yaml + OS::TripleO::Compute: puppet/compute-puppet.yaml OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment - OS::TripleO::Controller: controller-puppet.yaml - OS::TripleO::ObjectStorage: swift-storage-puppet.yaml + OS::TripleO::Controller: puppet/controller-puppet.yaml + OS::TripleO::ObjectStorage: puppet/swift-storage-puppet.yaml OS::TripleO::Net::SoftwareConfig: net-config-bridge.yaml - OS::TripleO::CephStorage: ceph-storage-puppet.yaml + OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml # NOTE(dprince): requires a new release of python-heatclient #default_parameters: diff --git a/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml index c9aa7bcf..c9aa7bcf 100644 --- a/ceph-storage-puppet.yaml +++ b/puppet/ceph-storage-puppet.yaml diff --git a/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index 433df328..befd8e4e 100644 --- a/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -144,9 +144,9 @@ resources: - common datafiles: common: - raw_data: {get_file: puppet/hieradata/common.yaml} + raw_data: {get_file: hieradata/common.yaml} volume: - raw_data: {get_file: puppet/hieradata/volume.yaml} + raw_data: {get_file: hieradata/volume.yaml} oac_data: cinder::volume::iscsi::iscsi_ip_address: local-ipv4 mapped_data: @@ -167,7 +167,7 @@ resources: outputs: - name: result config: - get_file: puppet/overcloud_volume.pp + get_file: manifests/overcloud_volume.pp VolumePuppetDeployment: type: OS::Heat::StructuredDeployment diff --git a/compute-puppet.yaml b/puppet/compute-puppet.yaml index 0448b7bf..ab2d0a32 100644 --- a/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -267,7 +267,7 @@ resources: outputs: - name: result config: - get_file: puppet/overcloud_compute.pp + get_file: manifests/overcloud_compute.pp ComputePuppetDeployment: type: OS::Heat::StructuredDeployment @@ -287,9 +287,9 @@ resources: - common datafiles: common: - raw_data: {get_file: puppet/hieradata/common.yaml} + raw_data: {get_file: hieradata/common.yaml} compute: - raw_data: {get_file: puppet/hieradata/compute.yaml} + raw_data: {get_file: hieradata/compute.yaml} oac_data: nova::compute::vncserver_proxyclient_address: local-ipv4 mapped_data: diff --git a/controller-puppet.yaml b/puppet/controller-puppet.yaml index 5974f9e4..399ad86b 100644 --- a/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -557,11 +557,11 @@ resources: - common datafiles: common: - raw_data: {get_file: puppet/hieradata/common.yaml} + raw_data: {get_file: hieradata/common.yaml} object: - raw_data: {get_file: puppet/hieradata/object.yaml} + raw_data: {get_file: hieradata/object.yaml} controller: - raw_data: {get_file: puppet/hieradata/controller.yaml} + raw_data: {get_file: hieradata/controller.yaml} oac_data: # data we map in from other OAC configurations bootstrap_nodeid: bootstrap_host.bootstrap_nodeid # Swift @@ -759,7 +759,7 @@ resources: outputs: - name: result config: - get_file: puppet/loadbalancer.pp + get_file: manifests/loadbalancer.pp ControllerLoadbalancerPuppetDeployment: type: OS::Heat::SoftwareDeployment @@ -780,7 +780,7 @@ resources: outputs: - name: result config: - get_file: puppet/overcloud_controller.pp + get_file: manifests/overcloud_controller.pp # Step through a series of Puppet runs using the same manifest. # NOTE(dprince): Heat breakpoints would make for a really cool way to step @@ -806,7 +806,7 @@ resources: outputs: - name: result config: - get_file: puppet/ringbuilder.pp + get_file: manifests/ringbuilder.pp ControllerRingbuilderPuppetDeployment: type: OS::Heat::StructuredDeployment diff --git a/puppet/loadbalancer.pp b/puppet/manifests/loadbalancer.pp index 88e6bdd4..88e6bdd4 100644 --- a/puppet/loadbalancer.pp +++ b/puppet/manifests/loadbalancer.pp diff --git a/puppet/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 0d2790b2..0d2790b2 100644 --- a/puppet/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp diff --git a/puppet/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 4801107b..4801107b 100644 --- a/puppet/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp diff --git a/puppet/overcloud_object.pp b/puppet/manifests/overcloud_object.pp index 8d0ad783..8d0ad783 100644 --- a/puppet/overcloud_object.pp +++ b/puppet/manifests/overcloud_object.pp diff --git a/puppet/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp index b433321a..b433321a 100644 --- a/puppet/overcloud_volume.pp +++ b/puppet/manifests/overcloud_volume.pp diff --git a/puppet/ringbuilder.pp b/puppet/manifests/ringbuilder.pp index 531706d2..531706d2 100644 --- a/puppet/ringbuilder.pp +++ b/puppet/manifests/ringbuilder.pp diff --git a/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index a529330f..7a831a58 100644 --- a/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -71,7 +71,7 @@ resources: outputs: - name: result config: - get_file: puppet/overcloud_object.pp + get_file: manifests/overcloud_object.pp StoragePuppetDeployment: type: OS::Heat::StructuredDeployment @@ -87,7 +87,7 @@ resources: outputs: - name: result config: - get_file: puppet/ringbuilder.pp + get_file: manifests/ringbuilder.pp StorageRingbuilderPuppetDeployment: type: OS::Heat::StructuredDeployment @@ -108,9 +108,9 @@ resources: - common datafiles: common: - raw_data: {get_file: puppet/hieradata/common.yaml} + raw_data: {get_file: hieradata/common.yaml} object: - raw_data: {get_file: puppet/hieradata/object.yaml} + raw_data: {get_file: hieradata/object.yaml} oac_data: # data we map in from other OAC configurations tripleo::ringbuilder::devices: swift.devices mapped_data: # data supplied directly to this deployment configuration, etc |