aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-08 09:06:56 +0000
committerGerrit Code Review <review@openstack.org>2016-01-08 09:06:56 +0000
commit30a05ce403c1ec6edef3bd458e21c870920b98e0 (patch)
tree7a27a19aeb9fd29124de4a7ab2705055cab8cd97
parent7c7a604893b4f0e9345dc93e6c80ebe916e0cb59 (diff)
parent31f121da065c705ebce58ef6fd8b3068c27525b7 (diff)
Merge "Fix yaml validation errors in multiple-nics templates"
-rw-r--r--network/config/multiple-nics/ceph-storage.yaml2
-rw-r--r--network/config/multiple-nics/cinder-storage.yaml2
-rw-r--r--network/config/multiple-nics/controller.yaml2
-rw-r--r--network/config/multiple-nics/swift-storage.yaml2
4 files changed, 4 insertions, 4 deletions
diff --git a/network/config/multiple-nics/ceph-storage.yaml b/network/config/multiple-nics/ceph-storage.yaml
index a2a6b40d..84cb0f12 100644
--- a/network/config/multiple-nics/ceph-storage.yaml
+++ b/network/config/multiple-nics/ceph-storage.yaml
@@ -84,7 +84,7 @@ resources:
config:
os_net_config:
network_config:
- -
+ -
type: interface
name: nic1
use_dhcp: false
diff --git a/network/config/multiple-nics/cinder-storage.yaml b/network/config/multiple-nics/cinder-storage.yaml
index 06b4b83f..0b0218c5 100644
--- a/network/config/multiple-nics/cinder-storage.yaml
+++ b/network/config/multiple-nics/cinder-storage.yaml
@@ -84,7 +84,7 @@ resources:
config:
os_net_config:
network_config:
- -
+ -
type: interface
name: nic1
use_dhcp: false
diff --git a/network/config/multiple-nics/controller.yaml b/network/config/multiple-nics/controller.yaml
index 32851cfb..377fd116 100644
--- a/network/config/multiple-nics/controller.yaml
+++ b/network/config/multiple-nics/controller.yaml
@@ -84,7 +84,7 @@ resources:
config:
os_net_config:
network_config:
- -
+ -
type: interface
name: nic1
use_dhcp: false
diff --git a/network/config/multiple-nics/swift-storage.yaml b/network/config/multiple-nics/swift-storage.yaml
index 4d5a7b99..b75bbd6e 100644
--- a/network/config/multiple-nics/swift-storage.yaml
+++ b/network/config/multiple-nics/swift-storage.yaml
@@ -84,7 +84,7 @@ resources:
config:
os_net_config:
network_config:
- -
+ -
type: interface
name: nic1
use_dhcp: false