summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-30 07:48:29 +0000
committerGerrit Code Review <review@openstack.org>2016-09-30 07:48:29 +0000
commitd601d64e110f5dfd3e471adc82ad8f898158c175 (patch)
tree99c4b0c3b535bb1c5e52a6df0928498b3b6837fe
parent01198c81d29af2a90670e782adff865715241b38 (diff)
parentb0d660702e837d493068055d85a511ef39afb510 (diff)
Merge "Move the rest of static roles resource registry entries to j2"
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml18
-rw-r--r--puppet/blockstorage.yaml (renamed from puppet/cinder-storage.yaml)0
-rw-r--r--puppet/cephstorage.yaml (renamed from puppet/ceph-storage.yaml)0
-rw-r--r--puppet/objectstorage.yaml (renamed from puppet/swift-storage.yaml)0
4 files changed, 4 insertions, 14 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index a7185a43..2aebc105 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -1,17 +1,7 @@
resource_registry:
- OS::TripleO::BlockStorage: puppet/cinder-storage.yaml
- OS::TripleO::Compute: puppet/compute.yaml
+
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
- OS::TripleO::Controller: puppet/controller.yaml
- OS::TripleO::ObjectStorage: puppet/swift-storage.yaml
- OS::TripleO::CephStorage: puppet/ceph-storage.yaml
- # set to controller-config-pacemaker.yaml to enable pacemaker
- OS::TripleO::ControllerConfig: puppet/controller-config.yaml
OS::TripleO::PostDeploySteps: puppet/post.yaml
- OS::TripleO::ComputeConfig: puppet/compute-config.yaml
- OS::TripleO::BlockStorageConfig: puppet/blockstorage-config.yaml
- OS::TripleO::ObjectStorageConfig: puppet/objectstorage-config.yaml
- OS::TripleO::CephStorageConfig: puppet/cephstorage-config.yaml
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
OS::TripleO::DefaultPasswords: default_passwords.yaml
@@ -20,11 +10,11 @@ resource_registry:
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
{% for role in roles %}
+ OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}.yaml
+ OS::TripleO::{{role.name}}Config: puppet/{{role.name.lower()}}-config.yaml
OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None
-
OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
-
# Port assignments for the {{role.name}} role
OS::TripleO::{{role.name}}::Ports::ExternalPort: network/ports/noop.yaml
OS::TripleO::{{role.name}}::Ports::InternalApiPort: network/ports/noop.yaml
@@ -32,8 +22,8 @@ resource_registry:
OS::TripleO::{{role.name}}::Ports::StorageMgmtPort: network/ports/noop.yaml
OS::TripleO::{{role.name}}::Ports::TenantPort: network/ports/noop.yaml
OS::TripleO::{{role.name}}::Ports::ManagementPort: network/ports/noop.yaml
-
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
+
{% endfor %}
# This resource registry entry will override the one generated by default
diff --git a/puppet/cinder-storage.yaml b/puppet/blockstorage.yaml
index a66ea08b..a66ea08b 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/blockstorage.yaml
diff --git a/puppet/ceph-storage.yaml b/puppet/cephstorage.yaml
index 03a53b00..03a53b00 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/cephstorage.yaml
diff --git a/puppet/swift-storage.yaml b/puppet/objectstorage.yaml
index 899ba66d..899ba66d 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/objectstorage.yaml