From 0ed4e93eb256c60a326d233dbf3259e123caf2d1 Mon Sep 17 00:00:00 2001 From: meimei Date: Fri, 20 May 2016 17:33:06 +0800 Subject: 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 --- .../huawei-us-deploy-vm-1/network.yml | 90 ---------------------- 1 file changed, 90 deletions(-) delete mode 100644 deploy/conf/vm_environment/huawei-us-deploy-vm-1/network.yml (limited to 'deploy/conf/vm_environment/huawei-us-deploy-vm-1/network.yml') diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-1/network.yml b/deploy/conf/vm_environment/huawei-us-deploy-vm-1/network.yml deleted file mode 100644 index 7fce6381..00000000 --- a/deploy/conf/vm_environment/huawei-us-deploy-vm-1/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.107.210" - - "192.168.107.220" - cidr: "192.168.107.0/24" - gw: "192.168.107.1" - role: - - controller - - compute - -internal_vip: - ip: 172.16.1.222 - netmask: "24" - interface: mgmt - -public_vip: - ip: 192.168.107.222 - 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.107.1" - floating_ip_cidr: "192.168.107.0/24" - floating_ip_start: "192.168.107.101" - floating_ip_end: "192.168.107.199" -- cgit 1.2.3-korg