aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-08-14 10:24:03 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-08-14 10:24:03 +0800
commit37db53e73201a46d673a5a52844a8c5d640b9403 (patch)
treef91532deb18929358b21267c92ec0ecc01584868 /deploy
parent02708db0054bcabf4db151d4b364d70ecc44ef18 (diff)
Modify moon network
1. modify interface file for moon according to new network structure 2. modify some ips for pods running master Change-Id: Idfca20c8e101222d27847fcac4f12ba21a1b5a67 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy')
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/network.yml10
-rw-r--r--deploy/conf/vm_environment/huawei-virtual1/network.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual2/network.yml2
-rw-r--r--deploy/conf/vm_environment/network.yml2
4 files changed, 8 insertions, 8 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network.yml b/deploy/conf/hardware_environment/huawei-pod1/network.yml
index cba041da..d7145a2c 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/network.yml
@@ -52,8 +52,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "10.1.0.100"
- - "10.1.0.220"
+ - - "10.1.0.50"
+ - "10.1.0.100"
dhcp_ranges:
- - "10.1.0.2"
- "10.1.0.49"
@@ -66,7 +66,7 @@ ip_settings:
- name: tenant
ip_ranges:
- - "172.16.1.1"
- - "172.16.1.254"
+ - "172.16.1.50"
cidr: "172.16.1.0/24"
role:
- controller
@@ -75,7 +75,7 @@ ip_settings:
- name: storage
ip_ranges:
- - "172.16.2.1"
- - "172.16.2.254"
+ - "172.16.2.50"
cidr: "172.16.2.0/24"
role:
- controller
@@ -106,7 +106,7 @@ public_net_info:
enable: "True"
network: ext-net
type: flat
- segment_id: 1000
+ segment_id: 10
subnet: ext-subnet
provider_network: physnet
router: router-ext
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network.yml b/deploy/conf/vm_environment/huawei-virtual1/network.yml
index fe5f8b52..924a4ea4 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network.yml
@@ -106,7 +106,7 @@ public_net_info:
enable: "True"
network: ext-net
type: flat
- segment_id: 10
+ segment_id: 1000
subnet: ext-subnet
provider_network: physnet
router: router-ext
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network.yml b/deploy/conf/vm_environment/huawei-virtual2/network.yml
index fe5f8b52..924a4ea4 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network.yml
@@ -106,7 +106,7 @@ public_net_info:
enable: "True"
network: ext-net
type: flat
- segment_id: 10
+ segment_id: 1000
subnet: ext-subnet
provider_network: physnet
router: router-ext
diff --git a/deploy/conf/vm_environment/network.yml b/deploy/conf/vm_environment/network.yml
index fe5f8b52..924a4ea4 100644
--- a/deploy/conf/vm_environment/network.yml
+++ b/deploy/conf/vm_environment/network.yml
@@ -106,7 +106,7 @@ public_net_info:
enable: "True"
network: ext-net
type: flat
- segment_id: 10
+ segment_id: 1000
subnet: ext-subnet
provider_network: physnet
router: router-ext