aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-03 09:06:29 +0000
committerGerrit Code Review <review@openstack.org>2015-12-03 09:06:29 +0000
commit5c604d28204397b49ad76d07df7e1351994f649e (patch)
treee5f2e3a45449ffd0d80620ddc51b01099c58cfd9
parent0072701294a3ca7f26edeec0e09b72fd511b7764 (diff)
parentdecad6e171477ce113d05fe59819344e104b76da (diff)
Merge "Fix default route in multiple nics net isolation templates"
-rw-r--r--network/config/multiple-nics/ceph-storage.yaml3
-rw-r--r--network/config/multiple-nics/cinder-storage.yaml3
-rw-r--r--network/config/multiple-nics/compute.yaml3
-rw-r--r--network/config/multiple-nics/swift-storage.yaml3
4 files changed, 12 insertions, 0 deletions
diff --git a/network/config/multiple-nics/ceph-storage.yaml b/network/config/multiple-nics/ceph-storage.yaml
index a0508583..7d650f4b 100644
--- a/network/config/multiple-nics/ceph-storage.yaml
+++ b/network/config/multiple-nics/ceph-storage.yaml
@@ -92,6 +92,9 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
+ -
+ default: true
+ next_hop: {get_param: ControlPlaneDefaultRoute}
-
type: interface
name: nic2
diff --git a/network/config/multiple-nics/cinder-storage.yaml b/network/config/multiple-nics/cinder-storage.yaml
index c84586bb..fdb6c9d8 100644
--- a/network/config/multiple-nics/cinder-storage.yaml
+++ b/network/config/multiple-nics/cinder-storage.yaml
@@ -92,6 +92,9 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
+ -
+ default: true
+ next_hop: {get_param: ControlPlaneDefaultRoute}
-
type: interface
name: nic2
diff --git a/network/config/multiple-nics/compute.yaml b/network/config/multiple-nics/compute.yaml
index 70a18081..0032a287 100644
--- a/network/config/multiple-nics/compute.yaml
+++ b/network/config/multiple-nics/compute.yaml
@@ -80,6 +80,9 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
+ -
+ default: true
+ next_hop: {get_param: ControlPlaneDefaultRoute}
-
type: interface
name: nic2
diff --git a/network/config/multiple-nics/swift-storage.yaml b/network/config/multiple-nics/swift-storage.yaml
index 25ac75f2..00e4f353 100644
--- a/network/config/multiple-nics/swift-storage.yaml
+++ b/network/config/multiple-nics/swift-storage.yaml
@@ -92,6 +92,9 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
+ -
+ default: true
+ next_hop: {get_param: ControlPlaneDefaultRoute}
-
type: interface
name: nic2