Move all puppet templates into puppet directory.
This cleans up the top level tree by moving all the puppet related bits into the puppet directory. The only exception is overcloud-resource-registry-puppet.yaml which is the puppet environment file and is used externally. Change-Id: Idb65a7143b0f29e5579d4e9d1642e4cda6f65d50
This commit is contained in:
parent
874e07dee1
commit
6b5ac01d2e
|
@ -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:
|
||||
|
|
|
@ -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
|
|
@ -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:
|
|
@ -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
|
|
@ -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
|
Loading…
Reference in New Issue