summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-03-09 16:59:35 +0800
committerJustin chi <chigang@huawei.com>2017-03-17 14:09:53 +0000
commit6e9c3463d671156e08189a93844cb02243af5027 (patch)
tree0d070ad3372dfdae5b61170e24cfee9dd18c9697
parent0f2acef45fdba11d3a1f8cc62a228cae8bfc0c84 (diff)
Add network_openo.yml in all virtual pods
add network_openo.yml to adapt with open-o scenario in: 1. huawei-virtual1 2. huawei-virtual2 3. huawei-virtual3 4. huawei-virtual4 5. huawei-virtual7 Change-Id: I96046470ddb05f8f613489db35f4a6b623a5cf4c Signed-off-by: Harry Huang <huangxiangyu5@huawei.com> (cherry picked from commit 36de0a04135b0932eab1e3a30d703a98aabc031d)
-rw-r--r--deploy/conf/vm_environment/huawei-virtual1/network_openo.yml114
-rw-r--r--deploy/conf/vm_environment/huawei-virtual2/network_openo.yml114
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_openo.yml114
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_openo.yml114
-rw-r--r--deploy/conf/vm_environment/huawei-virtual7/network_openo.yml (renamed from deploy/conf/vm_environment/huawei-virtual7/network.yml)0
5 files changed, 456 insertions, 0 deletions
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml
new file mode 100644
index 00000000..980fee79
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml
@@ -0,0 +1,114 @@
+##############################################################################
+# 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: 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"
+
+openo_net:
+ openo_vm_ip: "192.168.107.50"
+ openo_vm_mask: "255.255.255.0"
+ openo_external_gw: "192.168.107.1"
+ openo_external_cidr: "192.168.107.0/24"
+
+openo_docker_net:
+ docker_ip_start: "192.168.107.51"
+ docker_ip_end: "192.168.107.90"
+
+juju_net:
+ juju_net_cidr: "12.1.1.0/24"
+ juju_net_gw: "12.1.1.1"
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml
new file mode 100644
index 00000000..da30e37a
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml
@@ -0,0 +1,114 @@
+##############################################################################
+# 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: 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.106.210"
+ - "192.168.106.220"
+ cidr: "192.168.106.0/24"
+ gw: "192.168.106.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.168.106.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.106.1"
+ floating_ip_cidr: "192.168.106.0/24"
+ floating_ip_start: "192.168.106.101"
+ floating_ip_end: "192.168.106.199"
+
+openo_net:
+ openo_vm_ip: "192.168.106.50"
+ openo_vm_mask: "255.255.255.0"
+ openo_external_gw: "192.168.106.1"
+ openo_external_cidr: "192.168.106.0/24"
+
+openo_docker_net:
+ docker_ip_start: "192.168.106.51"
+ docker_ip_end: "192.168.106.90"
+
+juju_net:
+ juju_net_cidr: "12.1.1.0/24"
+ juju_net_gw: "12.1.1.1"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
new file mode 100644
index 00000000..643dd249
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
@@ -0,0 +1,114 @@
+##############################################################################
+# 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: 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.101.210"
+ - "192.168.101.220"
+ cidr: "192.168.101.0/24"
+ gw: "192.168.101.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.168.101.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.101.1"
+ floating_ip_cidr: "192.168.101.0/24"
+ floating_ip_start: "192.168.101.101"
+ floating_ip_end: "192.168.101.199"
+
+openo_net:
+ openo_vm_ip: "192.168.101.50"
+ openo_vm_mask: "255.255.255.0"
+ openo_external_gw: "192.168.101.1"
+ openo_external_cidr: "192.168.101.0/24"
+
+openo_docker_net:
+ docker_ip_start: "192.168.101.51"
+ docker_ip_end: "192.168.101.90"
+
+juju_net:
+ juju_net_cidr: "12.1.1.0/24"
+ juju_net_gw: "12.1.1.1"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual4/network_openo.yml
new file mode 100644
index 00000000..63536181
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_openo.yml
@@ -0,0 +1,114 @@
+##############################################################################
+# 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: 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.103.210"
+ - "192.168.103.220"
+ cidr: "192.168.103.0/24"
+ gw: "192.168.103.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.168.103.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.103.1"
+ floating_ip_cidr: "192.168.103.0/24"
+ floating_ip_start: "192.168.103.101"
+ floating_ip_end: "192.168.103.199"
+
+openo_net:
+ openo_vm_ip: "192.168.103.50"
+ openo_vm_mask: "255.255.255.0"
+ openo_external_gw: "192.168.103.1"
+ openo_external_cidr: "192.168.103.0/24"
+
+openo_docker_net:
+ docker_ip_start: "192.168.103.51"
+ docker_ip_end: "192.168.103.90"
+
+juju_net:
+ juju_net_cidr: "12.1.1.0/24"
+ juju_net_gw: "12.1.1.1"
diff --git a/deploy/conf/vm_environment/huawei-virtual7/network.yml b/deploy/conf/vm_environment/huawei-virtual7/network_openo.yml
index 2bf972e2..2bf972e2 100644
--- a/deploy/conf/vm_environment/huawei-virtual7/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual7/network_openo.yml