Specify the network for nodes

Without this, when there are multiple admin networks (e.g. a VLAN)
Nova will refuse to guess and we'll fail to deploy.

Change-Id: Id1dca43ef287fda2adcfdf5b5d30145b055dbe76

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index bb75ed9..baa20e2 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -177,6 +177,8 @@ Resources:
         Ref: ImageUpdatePolicy
       flavor: {Ref: OvercloudComputeFlavor}
       key_name: {Ref: KeyName}
+      networks:
+        - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
   NovaCompute0Deploy:
     DependsOn: [controller0Deployment]

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index a80a24c..6bf9a59 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -528,6 +528,8 @@ Resources:
         Ref: OvercloudControlFlavor
       key_name:
         Ref: KeyName
+      networks:
+        - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
   controller0AllNodesConfig:
     Type: OS::Heat::StructuredDeployment

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 6651758..aa0c9ee 100644 (file)
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -305,6 +305,8 @@ Resources:
         Ref: KeyName
       image_update_policy:
         Ref: ImageUpdatePolicy
+      networks:
+        - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
   99_undercloudDeployment:
     Type: OS::Heat::StructuredDeployment