aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network.yml2
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network_ocl.yml2
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network_onos.yml4
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml10
10 files changed, 39 insertions, 39 deletions
diff --git a/deploy/conf/hardware_environment/intel-pod8/network.yml b/deploy/conf/hardware_environment/intel-pod8/network.yml
index 7f00bc3e..85e379da 100644
--- a/deploy/conf/hardware_environment/intel-pod8/network.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network.yml
@@ -14,7 +14,7 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
interface: eth3
- vlan_tag: 854
+ vlan_tag: 805
type: vlan
role:
- controller
diff --git a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
index 7f00bc3e..85e379da 100644
--- a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
@@ -14,7 +14,7 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
interface: eth3
- vlan_tag: 854
+ vlan_tag: 805
type: vlan
role:
- controller
diff --git a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
index e1d099a1..5437a74b 100644
--- a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
@@ -5,7 +5,7 @@ bond_mappings: []
provider_net_mappings:
- name: br-prv
network: physnet
- interface: eth2
+ interface: eth1
type: ovs
role:
- controller
@@ -14,7 +14,7 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
interface: eth3
- vlan_tag: 854
+ vlan_tag: 805
type: vlan
role:
- controller
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
index 1d1fd529..b144603b 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
@@ -14,7 +14,7 @@ hosts:
- eth1: '00:1E:67:D4:30:D1'
- eth2: '00:1E:67:C5:5B:28'
- eth3: '00:1E:67:C5:5B:29'
- ipmiIp: 10.2.117.134
+ ipmiIp: 10.2.117.133
roles:
- controller
- ha
@@ -27,7 +27,7 @@ hosts:
- eth1: '00:1E:67:D4:39:B4'
- eth2: '00:1E:67:C5:52:24'
- eth3: '00:1E:67:C5:52:25'
- ipmiIp: 10.2.117.136
+ ipmiIp: 10.2.117.134
roles:
- controller
- ha
@@ -39,7 +39,7 @@ hosts:
- eth1: '00:1E:67:D4:31:B1'
- eth2: '00:1E:67:C1:FA:E0'
- eth3: '00:1E:67:C1:FA:E1'
- ipmiIp: 10.2.117.138
+ ipmiIp: 10.2.117.135
roles:
- controller
- ha
@@ -51,7 +51,7 @@ hosts:
- eth1: '00:1E:67:D4:34:66'
- eth2: '00:1E:67:E2:58:80'
- eth3: '00:1E:67:E2:58:81'
- ipmiIp: 10.2.117.140
+ ipmiIp: 10.2.117.136
roles:
- compute
- ceph-osd
@@ -62,7 +62,7 @@ hosts:
- eth1: '00:1E:67:D4:38:41'
- eth2: '00:1E:67:C1:F9:2C'
- eth3: '00:1E:67:C1:F9:2D'
- ipmiIp: 10.2.117.142
+ ipmiIp: 10.2.117.137
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
index 026e40aa..1beee7fb 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
@@ -15,7 +15,7 @@ hosts:
- eth1: '00:1E:67:D4:30:D1'
- eth2: '00:1E:67:C5:5B:28'
- eth3: '00:1E:67:C5:5B:29'
- ipmiIp: 10.2.117.134
+ ipmiIp: 10.2.117.133
roles:
- controller
- ha
@@ -29,7 +29,7 @@ hosts:
- eth1: '00:1E:67:D4:39:B4'
- eth2: '00:1E:67:C5:52:24'
- eth3: '00:1E:67:C5:52:25'
- ipmiIp: 10.2.117.136
+ ipmiIp: 10.2.117.134
roles:
- compute
- ceph-osd
@@ -40,7 +40,7 @@ hosts:
- eth1: '00:1E:67:D4:31:B1'
- eth2: '00:1E:67:C1:FA:E0'
- eth3: '00:1E:67:C1:FA:E1'
- ipmiIp: 10.2.117.138
+ ipmiIp: 10.2.117.135
roles:
- compute
- ceph-osd
@@ -51,7 +51,7 @@ hosts:
- eth1: '00:1E:67:D4:34:66'
- eth2: '00:1E:67:E2:58:80'
- eth3: '00:1E:67:E2:58:81'
- ipmiIp: 10.2.117.140
+ ipmiIp: 10.2.117.136
roles:
- compute
- ceph-osd
@@ -62,7 +62,7 @@ hosts:
- eth1: '00:1E:67:D4:38:41'
- eth2: '00:1E:67:C1:F9:2C'
- eth3: '00:1E:67:C1:F9:2D'
- ipmiIp: 10.2.117.142
+ ipmiIp: 10.2.117.137
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
index c065f5c6..431d8535 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
@@ -16,7 +16,7 @@ hosts:
- eth1: '00:1E:67:D4:30:D1'
- eth2: '00:1E:67:C5:5B:28'
- eth3: '00:1E:67:C5:5B:29'
- ipmiIp: 10.2.117.134
+ ipmiIp: 10.2.117.133
roles:
- controller
- ha
@@ -30,7 +30,7 @@ hosts:
- eth1: '00:1E:67:D4:39:B4'
- eth2: '00:1E:67:C5:52:24'
- eth3: '00:1E:67:C5:52:25'
- ipmiIp: 10.2.117.136
+ ipmiIp: 10.2.117.134
roles:
- controller
- ha
@@ -43,7 +43,7 @@ hosts:
- eth1: '00:1E:67:D4:31:B1'
- eth2: '00:1E:67:C1:FA:E0'
- eth3: '00:1E:67:C1:FA:E1'
- ipmiIp: 10.2.117.138
+ ipmiIp: 10.2.117.135
roles:
- controller
- ha
@@ -56,7 +56,7 @@ hosts:
- eth1: '00:1E:67:D4:34:66'
- eth2: '00:1E:67:E2:58:80'
- eth3: '00:1E:67:E2:58:81'
- ipmiIp: 10.2.117.140
+ ipmiIp: 10.2.117.136
roles:
- compute
- ceph-osd
@@ -67,7 +67,7 @@ hosts:
- eth1: '00:1E:67:D4:38:41'
- eth2: '00:1E:67:C1:F9:2C'
- eth3: '00:1E:67:C1:F9:2D'
- ipmiIp: 10.2.117.142
+ ipmiIp: 10.2.117.137
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
index 13e7fd0d..bf845d73 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
@@ -14,7 +14,7 @@ hosts:
- eth1: '00:1E:67:D4:30:D1'
- eth2: '00:1E:67:C5:5B:28'
- eth3: '00:1E:67:C5:5B:29'
- ipmiIp: 10.2.117.134
+ ipmiIp: 10.2.117.133
roles:
- controller
- ha
@@ -28,7 +28,7 @@ hosts:
- eth1: '00:1E:67:D4:39:B4'
- eth2: '00:1E:67:C5:52:24'
- eth3: '00:1E:67:C5:52:25'
- ipmiIp: 10.2.117.136
+ ipmiIp: 10.2.117.134
roles:
- controller
- ha
@@ -41,7 +41,7 @@ hosts:
- eth1: '00:1E:67:D4:31:B1'
- eth2: '00:1E:67:C1:FA:E0'
- eth3: '00:1E:67:C1:FA:E1'
- ipmiIp: 10.2.117.138
+ ipmiIp: 10.2.117.135
roles:
- controller
- ha
@@ -54,7 +54,7 @@ hosts:
- eth1: '00:1E:67:D4:34:66'
- eth2: '00:1E:67:E2:58:80'
- eth3: '00:1E:67:E2:58:81'
- ipmiIp: 10.2.117.140
+ ipmiIp: 10.2.117.136
roles:
- compute
- ceph-osd
@@ -65,7 +65,7 @@ hosts:
- eth1: '00:1E:67:D4:38:41'
- eth2: '00:1E:67:C1:F9:2C'
- eth3: '00:1E:67:C1:F9:2D'
- ipmiIp: 10.2.117.142
+ ipmiIp: 10.2.117.137
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
index 04fba033..23460ff0 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
@@ -16,7 +16,7 @@ hosts:
- eth1: '00:1E:67:D4:30:D1'
- eth2: '00:1E:67:C5:5B:28'
- eth3: '00:1E:67:C5:5B:29'
- ipmiIp: 10.2.117.134
+ ipmiIp: 10.2.117.133
roles:
- controller
- ha
@@ -30,7 +30,7 @@ hosts:
- eth1: '00:1E:67:D4:39:B4'
- eth2: '00:1E:67:C5:52:24'
- eth3: '00:1E:67:C5:52:25'
- ipmiIp: 10.2.117.136
+ ipmiIp: 10.2.117.134
roles:
- controller
- ha
@@ -43,7 +43,7 @@ hosts:
- eth1: '00:1E:67:D4:31:B1'
- eth2: '00:1E:67:C1:FA:E0'
- eth3: '00:1E:67:C1:FA:E1'
- ipmiIp: 10.2.117.138
+ ipmiIp: 10.2.117.135
roles:
- controller
- ha
@@ -56,7 +56,7 @@ hosts:
- eth1: '00:1E:67:D4:34:66'
- eth2: '00:1E:67:E2:58:80'
- eth3: '00:1E:67:E2:58:81'
- ipmiIp: 10.2.117.140
+ ipmiIp: 10.2.117.136
roles:
- compute
- ceph-osd
@@ -67,7 +67,7 @@ hosts:
- eth1: '00:1E:67:D4:38:41'
- eth2: '00:1E:67:C1:F9:2C'
- eth3: '00:1E:67:C1:F9:2D'
- ipmiIp: 10.2.117.142
+ ipmiIp: 10.2.117.137
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
index 57a790ea..d7fa89f5 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
@@ -14,7 +14,7 @@ hosts:
- eth1: '00:1E:67:D4:30:D1'
- eth2: '00:1E:67:C5:5B:28'
- eth3: '00:1E:67:C5:5B:29'
- ipmiIp: 10.2.117.134
+ ipmiIp: 10.2.117.133
roles:
- controller
- ha
@@ -28,7 +28,7 @@ hosts:
- eth1: '00:1E:67:D4:39:B4'
- eth2: '00:1E:67:C5:52:24'
- eth3: '00:1E:67:C5:52:25'
- ipmiIp: 10.2.117.136
+ ipmiIp: 10.2.117.134
roles:
- controller
- ha
@@ -41,7 +41,7 @@ hosts:
- eth1: '00:1E:67:D4:31:B1'
- eth2: '00:1E:67:C1:FA:E0'
- eth3: '00:1E:67:C1:FA:E1'
- ipmiIp: 10.2.117.138
+ ipmiIp: 10.2.117.135
roles:
- controller
- ha
@@ -54,7 +54,7 @@ hosts:
- eth1: '00:1E:67:D4:34:66'
- eth2: '00:1E:67:E2:58:80'
- eth3: '00:1E:67:E2:58:81'
- ipmiIp: 10.2.117.140
+ ipmiIp: 10.2.117.136
roles:
- compute
- ceph-osd
@@ -65,7 +65,7 @@ hosts:
- eth1: '00:1E:67:D4:38:41'
- eth2: '00:1E:67:C1:F9:2C'
- eth3: '00:1E:67:C1:F9:2D'
- ipmiIp: 10.2.117.142
+ ipmiIp: 10.2.117.137
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
index 1edd0276..fdafc3b9 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
@@ -16,7 +16,7 @@ hosts:
- eth1: '00:1E:67:D4:30:D1'
- eth2: '00:1E:67:C5:5B:28'
- eth3: '00:1E:67:C5:5B:29'
- ipmiIp: 10.2.117.134
+ ipmiIp: 10.2.117.133
roles:
- controller
- ha
@@ -30,7 +30,7 @@ hosts:
- eth1: '00:1E:67:D4:39:B4'
- eth2: '00:1E:67:C5:52:24'
- eth3: '00:1E:67:C5:52:25'
- ipmiIp: 10.2.117.136
+ ipmiIp: 10.2.117.134
roles:
- controller
- ha
@@ -43,7 +43,7 @@ hosts:
- eth1: '00:1E:67:D4:31:B1'
- eth2: '00:1E:67:C1:FA:E0'
- eth3: '00:1E:67:C1:FA:E1'
- ipmiIp: 10.2.117.138
+ ipmiIp: 10.2.117.135
roles:
- controller
- ha
@@ -56,7 +56,7 @@ hosts:
- eth1: '00:1E:67:D4:34:66'
- eth2: '00:1E:67:E2:58:80'
- eth3: '00:1E:67:E2:58:81'
- ipmiIp: 10.2.117.140
+ ipmiIp: 10.2.117.136
roles:
- compute
- ceph-osd
@@ -67,7 +67,7 @@ hosts:
- eth1: '00:1E:67:D4:38:41'
- eth2: '00:1E:67:C1:F9:2C'
- eth3: '00:1E:67:C1:F9:2D'
- ipmiIp: 10.2.117.142
+ ipmiIp: 10.2.117.137
roles:
- compute
- ceph-osd