diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-07-02 15:14:19 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-07-07 10:25:03 +1200 |
| commit | 303200408bd64fa0e6b8385ea13dfe0b4fd39df6 (patch) | |
| tree | cdc72125be27548ecc14d4a1c683b37ce0911b59 | |
| parent | 1c9c8249a2f245c053d6ee9ef088d49437a98fc1 (diff) | |
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
| -rw-r--r-- | nova-compute-instance.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 2 | ||||
| -rw-r--r-- | undercloud-source.yaml | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index bb75ed90..baa20e29 100644 --- 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 a80a24ce..6bf9a595 100644 --- 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 66517586..aa0c9eed 100644 --- 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 |