summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorJustin-chi <chigang@huawei.com>2016-02-06 09:43:27 +0800
committerJustin-chi <chigang@huawei.com>2016-02-06 09:43:27 +0800
commit591568ec3c309621689e50b32da328398c3b9df8 (patch)
treead6b41615acd34b4edb2a25df65381b5d430eda7 /deploy/conf
parentbf1d96eebbb3152558512cf2eec18bade5ab10e7 (diff)
add 4 scenarios in Intel POD for master daily job
network.yml: the network configuration for Intel pod os-*-ha.yaml: scenario configuration for Intel pod Change-Id: I6fce74f056f9ff20556845ca19d77840b48304f5 Signed-off-by: Justin-chi <chigang@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network.yml (renamed from deploy/conf/hardware_environment/intel_us_lab/pod8/dha.yml)0
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml58
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml63
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml61
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml61
-rw-r--r--deploy/conf/hardware_environment/intel_us_lab/pod8/network.yml90
6 files changed, 243 insertions, 90 deletions
diff --git a/deploy/conf/hardware_environment/intel_us_lab/pod8/dha.yml b/deploy/conf/hardware_environment/intel-pod8/network.yml
index 659b8075..659b8075 100644
--- a/deploy/conf/hardware_environment/intel_us_lab/pod8/dha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network.yml
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
new file mode 100644
index 00000000..b885c22b
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
@@ -0,0 +1,58 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiPass: root
+ipmiVer: '1.0'
+
+hosts:
+ - name: host1
+ mac: '00:1E:67:D4:30:D2'
+ interfaces:
+ - eth2: '00:1E:67:C5:5B:28'
+ - eth3: '00:1E:67:C5:5B:29'
+ ipmiIp: 10.2.117.127
+ roles:
+ - controller
+ - ha
+
+ - name: host2
+ mac: '00:1E:67:D4:39:B5'
+ interfaces:
+ - eth2: '00:1E:67:C5:52:24'
+ - eth3: '00:1E:67:C5:52:25'
+ ipmiIp: 10.2.117.129
+ roles:
+ - controller
+ - ha
+
+ - name: host3
+ mac: '00:1E:67:D4:31:B2'
+ interfaces:
+ - eth2: '00:1E:67:C1:FA:E0'
+ - eth3: '00:1E:67:C1:FA:E1'
+ ipmiIp: 10.2.117.131
+ roles:
+ - controller
+ - ha
+
+ - name: host4
+ mac: '00:1E:67:D4:34:67'
+ interfaces:
+ - eth2: '00:1E:67:E2:58:80'
+ - eth3: '00:1E:67:E2:58:81'
+ ipmiIp: 10.2.117.133
+ roles:
+ - compute
+
+ - name: host5
+ mac: '00:1E:67:D4:38:42'
+ interfaces:
+ - eth2: '00:1E:67:C1:F9:2C'
+ - eth3: '00:1E:67:C1:F9:2D'
+ ipmiIp: 10.2.117.135
+ roles:
+ - compute
+
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
new file mode 100644
index 00000000..75872efd
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
@@ -0,0 +1,63 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiPass: root
+ipmiVer: '1.0'
+
+hosts:
+ - name: host1
+ mac: '00:1E:67:D4:30:D2'
+ interfaces:
+ - eth2: '00:1E:67:C5:5B:28'
+ - eth3: '00:1E:67:C5:5B:29'
+ ipmiIp: 10.2.117.127
+ roles:
+ - controller
+ - ha
+ - open-contrail
+
+ - name: host2
+ mac: '00:1E:67:D4:39:B5'
+ interfaces:
+ - eth2: '00:1E:67:C5:52:24'
+ - eth3: '00:1E:67:C5:52:25'
+ ipmiIp: 10.2.117.129
+ roles:
+ - controller
+ - ha
+ - open-contrail
+
+ - name: host3
+ mac: '00:1E:67:D4:31:B2'
+ interfaces:
+ - eth2: '00:1E:67:C1:FA:E0'
+ - eth3: '00:1E:67:C1:FA:E1'
+ ipmiIp: 10.2.117.131
+ roles:
+ - controller
+ - ha
+ - open-contrail
+
+ - name: host4
+ mac: '00:1E:67:D4:34:67'
+ interfaces:
+ - eth2: '00:1E:67:E2:58:80'
+ - eth3: '00:1E:67:E2:58:81'
+ ipmiIp: 10.2.117.133
+ roles:
+ - compute
+ - open-contrail
+
+ - name: host5
+ mac: '00:1E:67:D4:38:42'
+ interfaces:
+ - eth2: '00:1E:67:C1:F9:2C'
+ - eth3: '00:1E:67:C1:F9:2D'
+ ipmiIp: 10.2.117.135
+ roles:
+ - compute
+ - open-contrail
+
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
new file mode 100644
index 00000000..e70169d7
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
@@ -0,0 +1,61 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiPass: root
+ipmiVer: '1.0'
+
+hosts:
+ - name: host1
+ mac: '00:1E:67:D4:30:D2'
+ interfaces:
+ - eth2: '00:1E:67:C5:5B:28'
+ - eth3: '00:1E:67:C5:5B:29'
+ ipmiIp: 10.2.117.127
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host2
+ mac: '00:1E:67:D4:39:B5'
+ interfaces:
+ - eth2: '00:1E:67:C5:52:24'
+ - eth3: '00:1E:67:C5:52:25'
+ ipmiIp: 10.2.117.129
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host3
+ mac: '00:1E:67:D4:31:B2'
+ interfaces:
+ - eth2: '00:1E:67:C1:FA:E0'
+ - eth3: '00:1E:67:C1:FA:E1'
+ ipmiIp: 10.2.117.131
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host4
+ mac: '00:1E:67:D4:34:67'
+ interfaces:
+ - eth2: '00:1E:67:E2:58:80'
+ - eth3: '00:1E:67:E2:58:81'
+ ipmiIp: 10.2.117.133
+ roles:
+ - compute
+
+ - name: host5
+ mac: '00:1E:67:D4:38:42'
+ interfaces:
+ - eth2: '00:1E:67:C1:F9:2C'
+ - eth3: '00:1E:67:C1:F9:2D'
+ ipmiIp: 10.2.117.135
+ roles:
+ - compute
+
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
new file mode 100644
index 00000000..5b1390d3
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
@@ -0,0 +1,61 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiPass: root
+ipmiVer: '1.0'
+
+hosts:
+ - name: host1
+ mac: '00:1E:67:D4:30:D2'
+ interfaces:
+ - eth2: '00:1E:67:C5:5B:28'
+ - eth3: '00:1E:67:C5:5B:29'
+ ipmiIp: 10.2.117.127
+ roles:
+ - controller
+ - ha
+ - onos
+
+ - name: host2
+ mac: '00:1E:67:D4:39:B5'
+ interfaces:
+ - eth2: '00:1E:67:C5:52:24'
+ - eth3: '00:1E:67:C5:52:25'
+ ipmiIp: 10.2.117.129
+ roles:
+ - controller
+ - ha
+ - onos
+
+ - name: host3
+ mac: '00:1E:67:D4:31:B2'
+ interfaces:
+ - eth2: '00:1E:67:C1:FA:E0'
+ - eth3: '00:1E:67:C1:FA:E1'
+ ipmiIp: 10.2.117.131
+ roles:
+ - controller
+ - ha
+ - onos
+
+ - name: host4
+ mac: '00:1E:67:D4:34:67'
+ interfaces:
+ - eth2: '00:1E:67:E2:58:80'
+ - eth3: '00:1E:67:E2:58:81'
+ ipmiIp: 10.2.117.133
+ roles:
+ - compute
+
+ - name: host5
+ mac: '00:1E:67:D4:38:42'
+ interfaces:
+ - eth2: '00:1E:67:C1:F9:2C'
+ - eth3: '00:1E:67:C1:F9:2D'
+ ipmiIp: 10.2.117.135
+ roles:
+ - compute
+
diff --git a/deploy/conf/hardware_environment/intel_us_lab/pod8/network.yml b/deploy/conf/hardware_environment/intel_us_lab/pod8/network.yml
deleted file mode 100644
index 06bcaf71..00000000
--- a/deploy/conf/hardware_environment/intel_us_lab/pod8/network.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-nic_mappings: []
-bond_mappings: []
-
-provider_net_mappings:
- - name: br-prv
- network: physnet
- interface: eth3
- type: ovs
- role:
- - controller
- - compute
-
-sys_intf_mappings:
- - name: mgmt
- interface: eth2
- vlan_tag: 804
- type: vlan
- role:
- - controller
- - compute
-
- - name: storage
- interface: eth2
- vlan_tag: 802
- type: vlan
- role:
- - controller
- - compute
-
- - name: external
- interface: br-prv
- vlan_tag: 805
- type: vlan
- role:
- - controller
- - compute
-
-ip_settings:
- - name: mgmt
- ip_ranges:
- - - "10.8.14.1"
- - "10.8.14.254"
- cidr: "10.8.14.0/24"
- role:
- - controller
- - compute
-
- - name: storage
- ip_ranges:
- - - "10.8.12.1"
- - "10.8.12.254"
- cidr: "10.8.12.0/24"
- role:
- - controller
- - compute
-
- - name: external
- ip_ranges:
- - - "10.8.15.1"
- - "10.8.15.254"
- cidr: "10.8.15.0/24"
- role:
- - controller
- - compute
-
-internal_vip:
- ip: 10.8.14.222
- netmask: "24"
- interface: mgmt
-
-public_vip:
- ip: 10.8.15.222
- netmask: "24"
- interface: external
-
-onos_nic: eth4
-public_net_info:
- enable: True
- network: ext-net
- type: flat
- segment_id: 10
- subnet: ext-subnet
- provider_network: physnet
- router: router-ext
- enable_dhcp: False
- no_gateway: False
- external_gw: "10.8.15.1"
- floating_ip_cidr: "10.8.15.0/24"
- floating_ip_start: "10.8.15.100"
- floating_ip_end: "10.8.15.200"