Rename Huawei Jenkins slaves

Slave names will be as below.

- huawei-us-deploy-bare-1 -> huawei-pod1
- huawei-us-deploy-bare-2 -> huawei-pod2
- huawei-sh-test-2-defaults -> huawei-pod3
- huawei-sh-pod6 -> huawei-pod4
- huawei-us-deploy-vm-1 -> huawei-virtual1
- huawei-us-deploy-vm-2 -> huawei-virtual2
- huawei-us-deploy-vm-3 -> huawei-virtual3
- huawei-us-deploy-vm-4 -> huawei-virtual4

Change-Id: I3a8727b0db53739b02a805cf40ddc3ba7f50ef52
Signed-off-by: meimei <meimei@huawei.com>

6 files changed, 0 insertions, 422 deletions

diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network.yml
deleted file mode 100644
index ab083472..00000000
--- a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network.yml
+++ /dev/null
@@ -1,90 +0,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: 101
-    type: vlan
-    role:
-      - controller
-      - compute
-
-  - name: storage
-    interface: eth1 
-    vlan_tag: 102
-    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.11.10"
-      - "192.168.11.15"
-    cidr: "192.168.11.0/24"
-    gw: "192.168.11.1"
-    role:
-      - controller
-      - compute
-
-internal_vip:
-  ip: 172.16.1.222
-  netmask: "24"
-  interface: mgmt
-
-public_vip:
-  ip: 192.168.11.18
-  netmask: "24"
-  interface: external
-
-onos_nic: eth2
-public_net_info:
-  enable: True
-  network: ext-net
-  type: flat
-  segment_id: 1000
-  subnet: ext-subnet
-  provider_network: physnet
-  router: router-ext
-  enable_dhcp: False
-  no_gateway: False
-  external_gw: "192.168.11.1"
-  floating_ip_cidr: "192.168.11.0/24"
-  floating_ip_start: "192.168.11.30"
-  floating_ip_end: "192.168.11.100"
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network_ocl.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network_ocl.yml
deleted file mode 100644
index 26319ec4..00000000
--- a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network_ocl.yml
+++ /dev/null
@@ -1,90 +0,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: 101
-    type: vlan
-    role:
-      - controller
-      - compute
-
-  - name: storage
-    interface: eth1 
-    vlan_tag: 102
-    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.11.10"
-      - "192.168.11.15"
-    cidr: "192.168.11.0/24"
-    gw: "192.168.11.1"
-    role:
-      - controller
-      - compute
-
-internal_vip:
-  ip: 172.16.1.222
-  netmask: "24"
-  interface: mgmt
-
-public_vip:
-  ip: 192.168.11.18
-  netmask: "24"
-  interface: external
-
-onos_nic: eth2
-public_net_info:
-  enable: True
-  network: ext-net
-  type: flat
-  segment_id: 1000
-  subnet: ext-subnet
-  provider_network: physnet
-  router: router-ext
-  enable_dhcp: False
-  no_gateway: False
-  external_gw: "100.100.100.1"
-  floating_ip_cidr: "100.100.100.0/24"
-  floating_ip_start: "100.100.100.30"
-  floating_ip_end: "100.100.100.120"
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-nosdn-nofeature-ha.yml
deleted file mode 100644
index a311c6d6..00000000
--- a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-nosdn-nofeature-ha.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-TYPE: baremetal
-FLAVOR: cluster
-POWER_TOOL: ipmitool
-
-ipmiVer: '2.0'
-
-hosts:
-  - name: host1
-    mac: 'EC:38:8F:79:0C:2C'
-    ipmiUser: root
-    ipmiPass: Huawei@123
-    ipmiIp: 172.16.130.20
-    interfaces:
-      - eth1: 'EC:38:8F:79:0C:2D'
-    roles:
-      - controller
-      - ha
-      - ceph-adm
-      - ceph-mon
-
-  - name: host2
-    mac: 'EC:38:8F:79:0C:48'
-    ipmiIp: 172.16.130.19
-    ipmiUser: root
-    ipmiPass: Huawei@123
-    interfaces:
-      - eth1: 'EC:38:8F:79:0C:49'
-    roles:
-      - controller
-      - ha
-      - ceph-mon
-
-  - name: host3
-    mac: 'EC:38:8F:79:10:CC'
-    ipmiIp: 172.16.130.18
-    ipmiUser: root
-    ipmiPass: Huawei@123
-    interfaces:
-      - eth1: 'EC:38:8F:79:10:CD'
-    roles:
-      - controller
-      - ha
-      - ceph-mon
-
-  - name: host4
-    mac: 'EC:38:8F:79:0C:6C'
-    ipmiIp: 172.16.130.17
-    ipmiUser: root
-    ipmiPass: Huawei@123
-    interfaces:
-      - eth1: 'EC:38:8F:79:0C:6D'
-    roles:
-      - compute
-      - ceph-osd
-
-  - name: host5
-    mac: 'EC:38:8F:7A:E6:ED'
-    ipmiIp: 172.16.130.16
-    ipmiUser: root
-    ipmiPass: Huawei@123
-    interfaces:
-      - eth1: 'EC:38:8F:7A:E6:EE'
-    roles:
-      - compute
-      - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-ocl-nofeature-ha.yml
deleted file mode 100644
index 0492efdb..00000000
--- a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-ocl-nofeature-ha.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-TYPE: baremetal
-FLAVOR: cluster
-POWER_TOOL: ipmitool
-
-ipmiUser: root
-ipmiVer: '2.0'
-
-hosts:
-  - name: host1
-    mac: 'F8:4A:BF:55:A2:8D'
-    interfaces:
-       - eth1: 'F8:4A:BF:55:A2:8E'
-    ipmiIp: 172.16.130.26
-    ipmiPass: Huawei@123
-    roles:
-      - controller
-      - ha
-      - opencontrail
-
-  - name: host2
-    mac: 'D8:49:0B:DA:5A:B7'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
-    ipmiPass: huawei@123
-    roles:
-      - compute
-
-  - name: host3
-    mac: 'D8:49:0B:DA:2A:28'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:2A:29'
-    ipmiIp: 172.16.130.29
-    ipmiPass: Huawei@123
-    roles:
-      - compute
-
-  - name: host4
-    mac: 'D8:49:0B:DA:5B:5D'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:5B:5E'
-    ipmiIp: 172.16.130.30
-    ipmiPass: Huawei@123
-    roles:
-      - compute
-
-  - name: host5
-    mac: 'D8:49:0B:DA:56:85'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:56:86'
-    ipmiIp: 172.16.130.31
-    ipmiPass: Huawei@123
-    roles:
-      - compute
-
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-odl_l2-nofeature-ha.yml
deleted file mode 100644
index ce10bab9..00000000
--- a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-odl_l2-nofeature-ha.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-TYPE: baremetal
-FLAVOR: cluster
-POWER_TOOL: ipmitool
-
-ipmiUser: root
-ipmiVer: '2.0'
-
-hosts:
-  - name: host1
-    mac: 'F8:4A:BF:55:A2:8D'
-    interfaces:
-       - eth1: 'F8:4A:BF:55:A2:8E'
-    ipmiIp: 172.16.130.26
-    ipmiPass: Huawei@123
-    roles:
-      - controller
-      - ha
-      - odl
-
-  - name: host2
-    mac: 'D8:49:0B:DA:5A:B7'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
-    ipmiPass: huawei@123
-    roles:
-      - controller
-      - ha
-      - odl
-
-  - name: host3
-    mac: 'D8:49:0B:DA:2A:28'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:2A:29'
-    ipmiIp: 172.16.130.29
-    ipmiPass: Huawei@123
-    roles:
-      - controller
-      - ha
-      - odl
-
-  - name: host4
-    mac: 'D8:49:0B:DA:5B:5D'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:5B:5E'
-    ipmiIp: 172.16.130.30
-    ipmiPass: Huawei@123
-    roles:
-      - compute
-
-  - name: host5
-    mac: 'D8:49:0B:DA:56:85'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:56:86'
-    ipmiIp: 172.16.130.31
-    ipmiPass: Huawei@123
-    roles:
-      - compute
-
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-onos-nofeature-ha.yml
deleted file mode 100644
index 9b05aded..00000000
--- a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-onos-nofeature-ha.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-TYPE: baremetal
-FLAVOR: cluster
-POWER_TOOL: ipmitool
-
-ipmiUser: root
-ipmiVer: '2.0'
-
-hosts:
-  - name: host1
-    mac: 'F8:4A:BF:55:A2:8D'
-    interfaces:
-       - eth1: 'F8:4A:BF:55:A2:8E'
-    ipmiIp: 172.16.130.26
-    ipmiPass: Huawei@123
-    roles:
-      - controller
-      - ha
-      - onos
-
-  - name: host2
-    mac: 'D8:49:0B:DA:5A:B7'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
-    ipmiPass: huawei@123
-    roles:
-      - controller
-      - ha
-      - onos
-
-  - name: host3
-    mac: 'D8:49:0B:DA:2A:28'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:2A:29'
-    ipmiIp: 172.16.130.29
-    ipmiPass: Huawei@123
-    roles:
-      - controller
-      - ha
-      - onos
-
-  - name: host4
-    mac: 'D8:49:0B:DA:5B:5D'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:5B:5E'
-    ipmiIp: 172.16.130.30
-    ipmiPass: Huawei@123
-    roles:
-      - compute
-
-  - name: host5
-    mac: 'D8:49:0B:DA:56:85'
-    interfaces:
-      - eth1: 'D8:49:0B:DA:56:86'
-    ipmiIp: 172.16.130.31
-    ipmiPass: Huawei@123
-    roles:
-      - compute
-