aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2015-09-23 14:23:44 +0800
committerbaigk <baiguoku@huawei.com>2015-09-24 00:22:30 +0800
commit5dcc94014a588e6f7bb5cb605b164609ac0b50c7 (patch)
tree1027a92382ed4a3c96c0bb2ec84ec1fdfd8e8b93 /deploy/conf
parent7d95e981d3685795620443083385e00ab1ccd3f0 (diff)
bug fix: using external_vip as linked dashboard ip
JIRA: COMPASS-72 Change-Id: I9ab8f6042635a7a06f1a4e2fb3222f790a5bee76 Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/network_cfg.yaml25
1 files changed, 12 insertions, 13 deletions
diff --git a/deploy/conf/network_cfg.yaml b/deploy/conf/network_cfg.yaml
index a5f2c79..d79ff8e 100644
--- a/deploy/conf/network_cfg.yaml
+++ b/deploy/conf/network_cfg.yaml
@@ -13,7 +13,7 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
interface: eth1
- vlan_tag: 2
+ vlan_tag: 101
type: vlan
role:
- controller
@@ -21,7 +21,7 @@ sys_intf_mappings:
- name: storage
interface: eth1
- vlan_tag: 3
+ vlan_tag: 102
type: vlan
role:
- controller
@@ -29,8 +29,7 @@ sys_intf_mappings:
- name: external
interface: br-prv
- vlan_tag: 4
- type: vlan
+ type: ovs
role:
- controller
- compute
@@ -56,10 +55,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "172.16.3.2"
- - "172.16.3.100"
- cidr: "172.16.3.0/24"
- gw: "172.16.3.1"
+ - - "192.168.50.210"
+ - "192.168.50.220"
+ cidr: "192.168.50.0/24"
+ gw: "192.168.50.1"
role:
- controller
- compute
@@ -70,7 +69,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 172.16.3.222
+ ip: 192.168.50.240
netmask: "24"
interface: external
@@ -84,7 +83,7 @@ public_net_info:
router: router-ext
enable_dhcp: False
no_gateway: False
- external_gw: "172.16.3.1"
- floating_ip_cidr: "172.16.3.0/24"
- floating_ip_start: "172.16.3.100"
- floating_ip_end: "172.16.3.254"
+ external_gw: "192.168.50.1"
+ floating_ip_cidr: "192.168.50.0/24"
+ floating_ip_start: "192.168.50.221"
+ floating_ip_end: "192.168.50.231"