aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/cobbler/snippets/kickstart_post_install_network_config7
-rw-r--r--deploy/adapters/cobbler/snippets/preseed_post_install_network_config7
-rw-r--r--deploy/adapters/cobbler/snippets/preseed_software_ansible2
-rw-r--r--deploy/bonding.py41
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod7/network.yml100
-rw-r--r--deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml65
-rw-r--r--deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml74
-rw-r--r--deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml75
-rw-r--r--deploy/conf/network_cfg.yaml18
-rwxr-xr-xdeploy/deploy_host.sh6
40 files changed, 538 insertions, 157 deletions
diff --git a/deploy/adapters/cobbler/snippets/kickstart_post_install_network_config b/deploy/adapters/cobbler/snippets/kickstart_post_install_network_config
index 2c089f9..1a5a7f6 100644
--- a/deploy/adapters/cobbler/snippets/kickstart_post_install_network_config
+++ b/deploy/adapters/cobbler/snippets/kickstart_post_install_network_config
@@ -426,9 +426,12 @@ declare -A used_logical_interfaces
used_logical_interfaces[$iname]=$iname
- #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave")
+ #if $iface_type in ("slave","bridge_slave","bonded_bridge_slave")
#set $static = 1
#end if
+ #if $ip == ""
+ #set $static = ""
+ #end if
echo "DEVICE=$iname" > $devfile
echo "ONBOOT=yes" >> $devfile
@@ -514,7 +517,7 @@ echo "GATEWAY=$if_gateway" >> $devfile
echo "NETMASK=$netmask" >> $devfile
#end if
#else
-echo "BOOTPROTO=dhcp" >> $devfile
+echo "BOOTPROTO=manual" >> $devfile
#if $len($name_servers) > 0
echo "PEERDNS=no" >> $devfile
#end if
diff --git a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
index cb79c55..7d4dcb9 100644
--- a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
+++ b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
@@ -441,15 +441,18 @@ echo "" >> /etc/network/interfaces
used_logical_interface_$iname=$iname
- #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave")
+ #if $iface_type in ("slave","bridge_slave","bonded_bridge_slave")
#set $static = 1
#end if
+ #if $ip == ""
+ #set $static = ""
+ #end if
echo "auto $iname" >> /etc/network/interfaces
#if $static
echo "iface $iname inet static" >> /etc/network/interfaces
#else
-echo "iface $iname inet dhcp" >> /etc/network/interfaces
+echo "iface $iname inet manual" >> /etc/network/interfaces
#end if
#if $iface_type not in ("master","bond","bridge","bonded_bridge_slave")
diff --git a/deploy/adapters/cobbler/snippets/preseed_software_ansible b/deploy/adapters/cobbler/snippets/preseed_software_ansible
index cde7935..5516c89 100644
--- a/deploy/adapters/cobbler/snippets/preseed_software_ansible
+++ b/deploy/adapters/cobbler/snippets/preseed_software_ansible
@@ -1 +1 @@
-d-i pkgsel/include string ntp ssh openssh-server wget vim
+d-i pkgsel/include string ntp ssh openssh-server wget vim ifenslave
diff --git a/deploy/bonding.py b/deploy/bonding.py
new file mode 100644
index 0000000..27e76da
--- /dev/null
+++ b/deploy/bonding.py
@@ -0,0 +1,41 @@
+import os
+import sys
+import yaml
+
+
+def exec_cmd(cmd):
+ print cmd
+ os.system(cmd)
+
+
+def create_bonding(network_info, rsa_file, compass_ip):
+ for bond in network_info['bond_mappings']:
+ bond_name = bond['name']
+ host_name = bond.get('host')
+ interfaces = bond.get('bond-slaves')
+ bond_mode = bond['bond-mode']
+ bond_miimon = bond['bond-miimon']
+ lacp_rate = bond['bond-lacp_rate']
+ xmit_hash_policy = bond['bond-xmit_hash_policy']
+ bond_mtu = bond['mtu']
+ if interfaces:
+ for host in host_name:
+ for interface in interfaces:
+ exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+ -i %s root@%s \
+ 'cobbler system edit --name=%s --interface=%s --interface-type=bond_slave --interface-master=%s'" # noqa
+ % (rsa_file, compass_ip, host, interface, bond_name)) # noqa
+
+ exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+ -i %s root@%s \
+ 'cobbler system edit --name=%s --interface=%s --interface-type=bond --bonding-opts=\"miimon=%s mode=%s lacp_rate=%s xmit_hash_policy=%s mtu=%s\"'" # noqa
+ % (rsa_file, compass_ip, host, bond_name, bond_miimon, bond_mode, lacp_rate, xmit_hash_policy, bond_mtu)) # noqa
+
+if __name__ == "__main__":
+ assert(len(sys.argv) == 4)
+ create_bonding(
+ yaml.load(
+ open(
+ sys.argv[1])),
+ sys.argv[2],
+ sys.argv[3])
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
index 38e20ba..6b329be 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -33,7 +33,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -44,7 +44,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -55,7 +55,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -65,7 +65,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
index 0d403bc..6027bdd 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
@@ -29,7 +29,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -41,7 +41,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -52,7 +52,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -63,7 +63,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -73,7 +73,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
index 3093645..287383b 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -44,7 +44,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -54,7 +54,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -64,7 +64,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
index f706669..60f2029 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml
index 527c1bf..fb33b45 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -46,7 +46,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -58,7 +58,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -68,7 +68,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml
index e840380..c8f47e7 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
index 1e4f32e..fb4b178 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -46,7 +46,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -58,7 +58,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -68,7 +68,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
index 221dc0b..1f40241 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5A:B8'
ipmiIp: 172.16.130.27
- ipmiPass: huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: '78:D7:52:A0:B1:9A'
ipmiIp: 172.16.130.29
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:5B:5E'
ipmiIp: 172.16.130.30
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'D8:49:0B:DA:56:86'
ipmiIp: 172.16.130.31
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod1
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml
index 53834c1..5b08ae5 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml
@@ -19,7 +19,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -33,7 +33,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -45,7 +45,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -57,7 +57,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -68,7 +68,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml
index a6dcccf..1836690 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml
@@ -27,7 +27,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -41,7 +41,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -53,7 +53,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -65,7 +65,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -76,7 +76,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
index 5fc6716..e304169 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
@@ -19,7 +19,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -34,7 +34,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -45,7 +45,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -56,7 +56,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -67,7 +67,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
index d9d6d83..985eb17 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
@@ -21,7 +21,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -36,7 +36,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -50,7 +50,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -64,7 +64,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -75,7 +75,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml
index 923e1cb..7aa9865 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml
@@ -19,7 +19,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -34,7 +34,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -48,7 +48,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -62,7 +62,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -73,7 +73,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml
index 4502cd1..793f818 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -36,7 +36,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -50,7 +50,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -64,7 +64,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -75,7 +75,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
index 08753eb..3770b6a 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
@@ -19,7 +19,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -34,7 +34,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -47,7 +47,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -60,7 +60,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -71,7 +71,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
index 25e984b..0effc85 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
@@ -21,7 +21,7 @@ hosts:
- name: host1
mac: 'EC:38:8F:79:0C:2C'
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
ipmiIp: 172.16.130.20
interfaces:
- eth1: 'EC:38:8F:79:0C:2D'
@@ -36,7 +36,7 @@ hosts:
mac: 'EC:38:8F:79:0C:48'
ipmiIp: 172.16.130.19
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:49'
roles:
@@ -49,7 +49,7 @@ hosts:
mac: 'EC:38:8F:79:10:CC'
ipmiIp: 172.16.130.18
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:10:CD'
roles:
@@ -62,7 +62,7 @@ hosts:
mac: 'EC:38:8F:79:0C:6C'
ipmiIp: 172.16.130.17
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:79:0C:6D'
roles:
@@ -73,7 +73,7 @@ hosts:
mac: 'EC:38:8F:7A:E6:ED'
ipmiIp: 172.16.130.16
ipmiUser: root
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod2
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml
index deb9c45..632776b 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -33,7 +33,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:C6'
ipmiIp: 172.16.131.18
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -44,7 +44,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:B9:1F:4A'
ipmiIp: 172.16.131.19
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -55,7 +55,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:EA'
ipmiIp: 172.16.131.20
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -65,7 +65,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AB:1E'
ipmiIp: 172.16.131.21
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml
index a86a1cf..efe9ace 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:C6'
ipmiIp: 172.16.131.18
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -44,7 +44,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:B9:1F:4A'
ipmiIp: 172.16.131.19
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -54,7 +54,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:EA'
ipmiIp: 172.16.131.20
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -64,7 +64,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AB:1E'
ipmiIp: 172.16.131.21
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml
index 5a37257..fa034d3 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:C6'
ipmiIp: 172.16.131.18
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:B9:1F:4A'
ipmiIp: 172.16.131.19
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:EA'
ipmiIp: 172.16.131.20
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AB:1E'
ipmiIp: 172.16.131.21
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml
index 80097b7..0554393 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:C6'
ipmiIp: 172.16.131.18
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -46,7 +46,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:B9:1F:4A'
ipmiIp: 172.16.131.19
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -58,7 +58,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:EA'
ipmiIp: 172.16.131.20
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -68,7 +68,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AB:1E'
ipmiIp: 172.16.131.21
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml
index 4d4c715..46f7e79 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:C6'
ipmiIp: 172.16.131.18
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:B9:1F:4A'
ipmiIp: 172.16.131.19
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:EA'
ipmiIp: 172.16.131.20
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AB:1E'
ipmiIp: 172.16.131.21
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml
index 01dd3a8..73068b5 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:C6'
ipmiIp: 172.16.131.18
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -46,7 +46,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:B9:1F:4A'
ipmiIp: 172.16.131.19
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -58,7 +58,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:EA'
ipmiIp: 172.16.131.20
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -68,7 +68,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AB:1E'
ipmiIp: 172.16.131.21
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml
index 01dd3a8..73068b5 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:C6'
ipmiIp: 172.16.131.18
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -46,7 +46,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:B9:1F:4A'
ipmiIp: 172.16.131.19
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- controller
- ha
@@ -58,7 +58,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AA:EA'
ipmiIp: 172.16.131.20
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
@@ -68,7 +68,7 @@ hosts:
interfaces:
- eth1: 'E8:4D:D0:BB:AB:1E'
ipmiIp: 172.16.131.21
- ipmiPass: Huawei@123
+ ipmiPass: Opnfv@pod4
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
index b0fa180..acf996d 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -33,7 +33,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5A:D0'
ipmiIp: 192.168.5.174
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -44,7 +44,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:55'
ipmiIp: 192.168.5.175
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -55,7 +55,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5D:4C'
ipmiIp: 192.168.5.176
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -65,7 +65,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:63:31'
ipmiIp: 192.168.5.177
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
index dd5158e..6e486b5 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5A:D0'
ipmiIp: 192.168.5.174
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -44,7 +44,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:55'
ipmiIp: 192.168.5.175
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -54,7 +54,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5D:4C'
ipmiIp: 192.168.5.176
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -64,7 +64,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:63:31'
ipmiIp: 192.168.5.177
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
index defafed..9829885 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5A:D0'
ipmiIp: 192.168.5.174
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:55'
ipmiIp: 192.168.5.175
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5D:4C'
ipmiIp: 192.168.5.176
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:63:31'
ipmiIp: 192.168.5.177
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
index 24e7f51..58c8edc 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5A:D0'
ipmiIp: 192.168.5.174
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -46,7 +46,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:55'
ipmiIp: 192.168.5.175
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -58,7 +58,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5D:4C'
ipmiIp: 192.168.5.176
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -68,7 +68,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:63:31'
ipmiIp: 192.168.5.177
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
index 2b000e8..921fe81 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5A:D0'
ipmiIp: 192.168.5.174
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:55'
ipmiIp: 192.168.5.175
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5D:4C'
ipmiIp: 192.168.5.176
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:63:31'
ipmiIp: 192.168.5.177
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
index 70dd9d5..59e9452 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
@@ -21,7 +21,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -34,7 +34,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5A:D0'
ipmiIp: 192.168.5.174
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -46,7 +46,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:55'
ipmiIp: 192.168.5.175
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -58,7 +58,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5D:4C'
ipmiIp: 192.168.5.176
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -68,7 +68,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:63:31'
ipmiIp: 192.168.5.177
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
index c47814c..f81b9d2 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
@@ -23,7 +23,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -36,7 +36,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5A:D0'
ipmiIp: 192.168.5.174
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -48,7 +48,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:67:55'
ipmiIp: 192.168.5.175
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- controller
- ha
@@ -60,7 +60,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:5D:4C'
ipmiIp: 192.168.5.176
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
@@ -70,7 +70,7 @@ hosts:
interfaces:
- eth1: 'E0:97:96:10:63:31'
ipmiIp: 192.168.5.177
- ipmiPass: Huawei12#$
+ ipmiPass: Opnfv@pod5
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod7/network.yml b/deploy/conf/hardware_environment/huawei-pod7/network.yml
new file mode 100644
index 0000000..e255c69
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/network.yml
@@ -0,0 +1,100 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+nic_mappings: []
+bond_mappings: []
+
+provider_net_mappings:
+ - name: br-prv
+ network: physnet
+ interface: eth1
+ type: ovs
+ role:
+ - controller
+ - compute
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth1
+ vlan_tag: 2001
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth1
+ vlan_tag: 2002
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: external
+ interface: br-prv
+ type: ovs
+ role:
+ - controller
+ - compute
+
+ip_settings:
+ - name: mgmt
+ ip_ranges:
+ - - "172.16.1.1"
+ - "172.16.1.254"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.254"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "192.168.20.10"
+ - "192.168.20.50"
+ cidr: "192.168.20.0/24"
+ gw: "192.168.20.250"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.168.20.222
+ netmask: "24"
+ interface: external
+
+onos_nic: eth2
+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: "192.168.20.250"
+ floating_ip_cidr: "192.168.20.0/24"
+ floating_ip_start: "192.168.20.100"
+ floating_ip_end: "192.168.20.200"
diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml
new file mode 100644
index 0000000..71cac58
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml
@@ -0,0 +1,65 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '88:cf:98:61:66:77'
+ interfaces:
+ - eth1: '88:CF:98:61:66:76'
+ ipmiIp: 192.168.120.12
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+
+ - name: host2
+ mac: '88:cf:98:61:66:c9'
+ interfaces:
+ - eth1: '88:CF:98:61:66:C8'
+ ipmiIp: 192.168.120.13
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+
+ - name: host3
+ mac: '88:cf:98:83:31:98'
+ interfaces:
+ - eth1: '88:CF:98:83:31:97'
+ ipmiIp: 192.168.120.14
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+
+ - name: host4
+ mac: '88:cf:98:61:67:09'
+ interfaces:
+ - eth1: '88:CF:98:61:67:08'
+ ipmiIp: 192.168.120.15
+ ipmiPass: Opnfv@pod7
+ roles:
+ - compute
+
+ - name: host5
+ mac: '88:cf:98:83:31:e4'
+ interfaces:
+ - eth1: '88:CF:98:83:31:E3'
+ ipmiIp: 192.168.120.16
+ ipmiPass: Opnfv@pod7
+ roles:
+ - compute
diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml
new file mode 100644
index 0000000..d117d2f
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml
@@ -0,0 +1,74 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '88:cf:98:61:66:77'
+ interfaces:
+ - eth1: '88:CF:98:61:66:76'
+ ipmiIp: 192.168.120.12
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '88:cf:98:61:66:c9'
+ interfaces:
+ - eth1: '88:CF:98:61:66:C8'
+ ipmiIp: 192.168.120.13
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host3
+ mac: '88:cf:98:83:31:98'
+ interfaces:
+ - eth1: '88:CF:98:83:31:97'
+ ipmiIp: 192.168.120.14
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host4
+ mac: '88:cf:98:61:67:09'
+ interfaces:
+ - eth1: '88:CF:98:61:67:08'
+ ipmiIp: 192.168.120.15
+ ipmiPass: Opnfv@pod7
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '88:cf:98:83:31:e4'
+ interfaces:
+ - eth1: '88:CF:98:83:31:E3'
+ ipmiIp: 192.168.120.16
+ ipmiPass: Opnfv@pod7
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml
new file mode 100644
index 0000000..987a773
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml
@@ -0,0 +1,75 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+odl_l3_agent: "Enable"
+hosts:
+ - name: host1
+ mac: '88:cf:98:61:66:77'
+ interfaces:
+ - eth1: '88:CF:98:61:66:76'
+ ipmiIp: 192.168.120.12
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '88:cf:98:61:66:c9'
+ interfaces:
+ - eth1: '88:CF:98:61:66:C8'
+ ipmiIp: 192.168.120.13
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host3
+ mac: '88:cf:98:83:31:98'
+ interfaces:
+ - eth1: '88:CF:98:83:31:97'
+ ipmiIp: 192.168.120.14
+ ipmiPass: Opnfv@pod7
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host4
+ mac: '88:cf:98:61:67:09'
+ interfaces:
+ - eth1: '88:CF:98:61:67:08'
+ ipmiIp: 192.168.120.15
+ ipmiPass: Opnfv@pod7
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '88:cf:98:83:31:e4'
+ interfaces:
+ - eth1: '88:CF:98:83:31:E3'
+ ipmiIp: 192.168.120.16
+ ipmiPass: Opnfv@pod7
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/network_cfg.yaml b/deploy/conf/network_cfg.yaml
index 28224b6..5e704e8 100644
--- a/deploy/conf/network_cfg.yaml
+++ b/deploy/conf/network_cfg.yaml
@@ -9,7 +9,23 @@
---
nic_mappings: []
-bond_mappings: []
+
+bond_mappings:
+ - name: bond1
+ host:
+ - host1
+ - host2
+ - host3
+ - host4
+ - host5
+ bond-slaves:
+ - eth1
+ - eth2
+ bond-mode: 802.3ad
+ bond-miimon: 100
+ bond-lacp_rate: fast
+ bond-xmit_hash_policy: layer2
+ mtu: 9000
provider_net_mappings:
- name: br-prv
diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh
index 6454a4b..4f75641 100755
--- a/deploy/deploy_host.sh
+++ b/deploy/deploy_host.sh
@@ -13,6 +13,10 @@ function rename_nics(){
python $COMPASS_DIR/deploy/rename_nics.py $DHA $rsa_file $MGMT_IP $OS_VERSION
}
+function add_bonding(){
+ python $COMPASS_DIR/deploy/bonding.py $NETWORK $rsa_file $MGMT_IP
+}
+
function deploy_host(){
export AYNC_TIMEOUT=20
ssh $ssh_args root@${MGMT_IP} mkdir -p /opt/compass/bin/ansible_callbacks
@@ -22,7 +26,7 @@ function deploy_host(){
scp $ssh_args -r ${COMPASS_DIR}/deploy/adapters/ansible/ansible_modules/* root@${MGMT_IP}:/opt/ansible-modules
# avoid nodes reboot to fast, cobbler can not give response
- (sleep $AYNC_TIMEOUT; rename_nics; reboot_hosts) &
+ (sleep $AYNC_TIMEOUT; add_bonding; rename_nics; reboot_hosts) &
if [[ "$REDEPLOY_HOST" == true ]]; then
deploy_flag="redeploy"
else