summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuangxiangyu <huangxiangyu5@huawei.com>2017-06-20 11:36:18 +0800
committerhuangxiangyu <huangxiangyu5@huawei.com>2017-06-20 11:39:17 +0800
commit4e17e4eaff91f0551fa57daab4c7ad11edce8863 (patch)
treec4c91b621e1427a14898eefc2f27c173e886b1ec
parentdcce2491af9015d6d903d784ae1c145f329ece43 (diff)
fix baremetal deploy
1. delete package part when external network is not ready 2. modify some vm_environment ip to adapt with containerized compass4nfv code Change-Id: I9d777675e7ca9d6f9b12a885df8677b2446e6917 Signed-off-by: huangxiangyu <huangxiangyu5@huawei.com>
-rw-r--r--deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml6
-rw-r--r--deploy/conf/vm_environment/huawei-virtual1/network_openo.yml20
-rw-r--r--deploy/conf/vm_environment/huawei-virtual2/network_openo.yml20
3 files changed, 20 insertions, 26 deletions
diff --git a/deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml b/deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml
index 5bd38f12..747f5eb7 100644
--- a/deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/pre-prepare/tasks/main.yml
@@ -59,12 +59,6 @@
path: /etc/apt/apt.conf
state: absent
-- name: Install apt packages
- apt:
- pkg: "{{ item }}"
- state: "present"
- with_items: "{{ packages }}"
-
- name: restart ntp service
shell: "service ntp restart"
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml
index a31c2990..e0663439 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.107.210"
- - "192.168.107.220"
- cidr: "192.168.107.0/24"
- gw: "192.168.107.1"
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
role:
- controller
- compute
@@ -79,12 +79,12 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.107.222
+ ip: 192.16.1.222
netmask: "24"
interface: external
openo_net:
- openo_ip: 192.168.107.50
+ openo_ip: 192.16.1.50
openo_docker_gw: 172.11.1.1
openo_docker_cidr: 172.11.1.0/24
@@ -99,7 +99,7 @@ public_net_info:
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"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml
index 98b3a83d..e0663439 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.106.210"
- - "192.168.106.220"
- cidr: "192.168.106.0/24"
- gw: "192.168.106.1"
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
role:
- controller
- compute
@@ -79,12 +79,12 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.106.222
+ ip: 192.16.1.222
netmask: "24"
interface: external
openo_net:
- openo_ip: 192.168.106.50
+ openo_ip: 192.16.1.50
openo_docker_gw: 172.11.1.1
openo_docker_cidr: 172.11.1.0/24
@@ -99,7 +99,7 @@ public_net_info:
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"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"