aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
Diffstat (limited to 'environments')
-rw-r--r--environments/net-bond-with-vlans.yaml13
-rw-r--r--environments/overcloud-steps.yaml10
2 files changed, 23 insertions, 0 deletions
diff --git a/environments/net-bond-with-vlans.yaml b/environments/net-bond-with-vlans.yaml
new file mode 100644
index 00000000..38c31cac
--- /dev/null
+++ b/environments/net-bond-with-vlans.yaml
@@ -0,0 +1,13 @@
+# This template configures each role to use a pair of bonded nics (nic2 and
+# nic3) and configures an IP address on each relevant isolated network
+# for each role. This template assumes use of network-isolation.yaml.
+#
+# FIXME: if/when we add functionality to heatclient to include heat
+# environment files we should think about using it here to automatically
+# include network-isolation.yaml.
+resource_registry:
+ OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/cinder-storage.yaml
+ OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/bond-with-vlans/compute.yaml
+ OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller.yaml
+ OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
+ OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml
diff --git a/environments/overcloud-steps.yaml b/environments/overcloud-steps.yaml
new file mode 100644
index 00000000..99f73688
--- /dev/null
+++ b/environments/overcloud-steps.yaml
@@ -0,0 +1,10 @@
+# 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
+# a user signal on every *Deployment_StepN resource defined in those files.
+resource_registry:
+ resources:
+ "*NodesPostDeployment":
+ "*Deployment_Step*":
+ hooks: [pre-create, pre-update]