summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/ceph-osd/tasks/install_osd.yml5
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml5
-rw-r--r--deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-osd/tasks/install_osd.yml5
-rwxr-xr-xdeploy/adapters/ansible/openstack_osp9/roles/ceph-osd/tasks/install_osd.yml5
-rwxr-xr-xdeploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml15
-rwxr-xr-xdeploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml4
-rwxr-xr-xdeploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml32
-rw-r--r--deploy/adapters/ansible/roles/ceph-openstack/templates/secret.j22
-rw-r--r--deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml5
-rwxr-xr-xdeploy/compass_vm.sh19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network.yml22
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml14
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_onos.yml22
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml41
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml40
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml41
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml41
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml41
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml41
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml40
-rwxr-xr-xdeploy/prepare.sh8
21 files changed, 274 insertions, 174 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/openstack_mitaka/roles/ceph-osd/tasks/install_osd.yml
index 0e476085..35e84cf8 100644
--- a/deploy/adapters/ansible/openstack_mitaka/roles/ceph-osd/tasks/install_osd.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/ceph-osd/tasks/install_osd.yml
@@ -11,6 +11,11 @@
- name: create osd lv and mount it on /var/local/osd
script: create_osd.sh
+- name: fetch osd keyring from ceph_adm
+ fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: copy osd keyring
copy: src="/tmp/ceph.osd.keyring" dest="/var/lib/ceph/bootstrap-osd/ceph.keyring"
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml
index 16f261ef..363e5e6d 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-osd/tasks/install_osd.yml
@@ -11,6 +11,11 @@
- name: create osd lv and mount it on /var/local/osd
script: create_osd.sh
+- name: fetch osd keyring from ceph_adm
+ fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: copy osd keyring
copy: src="/tmp/ceph.osd.keyring" dest="/var/lib/ceph/bootstrap-osd/ceph.keyring"
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-osd/tasks/install_osd.yml
index 16f261ef..363e5e6d 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-osd/tasks/install_osd.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-osd/tasks/install_osd.yml
@@ -11,6 +11,11 @@
- name: create osd lv and mount it on /var/local/osd
script: create_osd.sh
+- name: fetch osd keyring from ceph_adm
+ fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: copy osd keyring
copy: src="/tmp/ceph.osd.keyring" dest="/var/lib/ceph/bootstrap-osd/ceph.keyring"
diff --git a/deploy/adapters/ansible/openstack_osp9/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/openstack_osp9/roles/ceph-osd/tasks/install_osd.yml
index 0e476085..35e84cf8 100755
--- a/deploy/adapters/ansible/openstack_osp9/roles/ceph-osd/tasks/install_osd.yml
+++ b/deploy/adapters/ansible/openstack_osp9/roles/ceph-osd/tasks/install_osd.yml
@@ -11,6 +11,11 @@
- name: create osd lv and mount it on /var/local/osd
script: create_osd.sh
+- name: fetch osd keyring from ceph_adm
+ fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: copy osd keyring
copy: src="/tmp/ceph.osd.keyring" dest="/var/lib/ceph/bootstrap-osd/ceph.keyring"
diff --git a/deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml b/deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml
index 891e23e0..771fb6ab 100755
--- a/deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml
+++ b/deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml
@@ -18,6 +18,11 @@
dest: "/tmp/ceph.conf"
when: inventory_hostname in groups['ceph_adm']
+- name: fetch ceph conf from ceph_adm
+ fetch: src="/etc/ceph/ceph.conf" dest="/tmp/ceph.conf" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: "make directory for ceph config file"
file: path="/etc/ceph" state="directory"
@@ -53,10 +58,20 @@
fetch: src="/tmp/ceph.mon.keyring" dest="/tmp/ceph.mon.keyring" flat=yes
when: inventory_hostname in groups['ceph_adm']
+- name: fetch mon.keyring from ceph_adm
+ fetch: src="/tmp/ceph.mon.keyring" dest="/tmp/ceph.mon.keyring" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: fetch client.admin.keyring to local
fetch: src="/etc/ceph/ceph.client.admin.keyring" dest="/tmp/ceph.client.admin.keyring" flat=yes
when: inventory_hostname in groups['ceph_adm']
+- name: fetch mon.keyring from ceph_adm
+ fetch: src="/etc/ceph/ceph.client.admin.keyring" dest="/tmp/ceph.client.admin.keyring" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: copy mon.keyring to remote nodes
copy: src="/tmp/ceph.mon.keyring" dest="/tmp/ceph.mon.keyring"
diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
index d7c414ee..0496ba97 100755
--- a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
+++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
@@ -28,13 +28,13 @@
ignore_errors: True
- name: modify cinder.conf for ceph
- shell: sed -i 's/^\(volume_driver\).*/\1 = cinder.volume.drivers.rbd.RBDDriver/g' /etc/cinder/cinder.conf && sed -i 's/^\(rbd_secret_uuid\).*/\1 = {{ ceph_uuid.stdout_lines[0] }}/g' /etc/cinder/cinder.conf && sed -i '/^\[DEFAULT/a rbd_pool = volumes\nrbd_ceph_conf = /etc/ceph/ceph.conf\nrbd_flatten_volume_from_snapshot = false\nrbd_max_clone_depth = 5\nrbd_store_chunk_size = 4\nrados_connect_timeout = -1\nglance_api_version = 2\nrbd_user = cinder\nrbd_secret_uuid = {{ ceph_uuid.stdout_lines[0] }}' /etc/cinder/cinder.conf && service {{ cinder_service }} restart
+ shell: sed -i 's/^\(volume_driver\).*/\1 = cinder.volume.drivers.rbd.RBDDriver/g' /etc/cinder/cinder.conf && sed -i 's/^\(rbd_secret_uuid\).*/\1 = {{ ceph_uuid }}/g' /etc/cinder/cinder.conf && sed -i '/^\[DEFAULT/a rbd_pool = volumes\nrbd_ceph_conf = /etc/ceph/ceph.conf\nrbd_flatten_volume_from_snapshot = false\nrbd_max_clone_depth = 5\nrbd_store_chunk_size = 4\nrados_connect_timeout = -1\nglance_api_version = 2\nrbd_user = cinder\nrbd_secret_uuid = {{ ceph_uuid }}' /etc/cinder/cinder.conf && service {{ cinder_service }} restart
when: inventory_hostname in groups['compute']
tags:
- ceph_conf_cinder
- name: modify nova.conf for ceph
- shell: sed -i 's/^\(images_type\).*/\1 = rbd/g' /etc/nova/nova-compute.conf && sed -i 's/^\(rbd_secret_uuid\).*/\1 = {{ ceph_uuid.stdout_lines[0] }}/g' /etc/nova/nova-compute.conf && sed -i '/^\[libvirt/a images_rbd_pool = vms\nimages_rbd_ceph_conf = /etc/ceph/ceph.conf\nrbd_user = cinder\nrbd_secret_uuid = {{ ceph_uuid.stdout_lines[0] }}\ndisk_cachemodes=\"network=writeback\"\nlive_migration_flag=\"VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST,VIR_MIGRATE_TUNNELLED\"' /etc/nova/nova-compute.conf && service {{ nova_service }} restart
+ shell: sed -i 's/^\(images_type\).*/\1 = rbd/g' /etc/nova/nova-compute.conf && sed -i 's/^\(rbd_secret_uuid\).*/\1 = {{ ceph_uuid }}/g' /etc/nova/nova-compute.conf && sed -i '/^\[libvirt/a images_rbd_pool = vms\nimages_rbd_ceph_conf = /etc/ceph/ceph.conf\nrbd_user = cinder\nrbd_secret_uuid = {{ ceph_uuid }}\ndisk_cachemodes=\"network=writeback\"\nlive_migration_flag=\"VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST,VIR_MIGRATE_TUNNELLED\"' /etc/nova/nova-compute.conf && service {{ nova_service }} restart
when: inventory_hostname in groups['compute']
tags:
- ceph_conf_nova
diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml
index 78b71ec0..ece4154f 100755
--- a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml
+++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml
@@ -9,11 +9,39 @@
---
- name: gen ceph uuid
shell: uuidgen
- register: ceph_uuid
+ register: ceph_uuid_out
run_once: true
tags:
- ceph_copy_secret
+- name: set ceph uuid var
+ set_fact:
+ ceph_uuid: "{{ ceph_uuid_out.stdout_lines[0] }}"
+ when: not compute_expansion
+ tags:
+ - ceph_copy_secret
+
+- name: save ceph uuid for expansion
+ copy: content="{{ ceph_uuid }}" dest=/etc/ceph/ceph.uuid.libvirt
+ when: not compute_expansion and inventory_hostname in groups['controller']
+ tags:
+ - ceph_copy_secret
+
+- name: fetch ceph uuid from controller node for expansion
+ shell: cat /etc/ceph/ceph.uuid.libvirt
+ register: ceph_uuid_out
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion and inventory_hostname in groups['compute']
+ tags:
+ - ceph_copy_secret
+
+- name: set ceph uuid var for expansion
+ set_fact:
+ ceph_uuid: "{{ ceph_uuid_out.stdout_lines[0] }}"
+ when: compute_expansion and inventory_hostname in groups['compute']
+ tags:
+ - ceph_copy_secret
+
- name: gen template secret.xml
local_action:
module: "template"
@@ -68,7 +96,7 @@
- name: create key for libvirt on compute nodes
- shell: "virsh secret-define --file ~/secret.xml && virsh secret-set-value --secret {{ ceph_uuid.stdout_lines[0] }} --base64 $(cat client.cinder.key)"
+ shell: "virsh secret-define --file ~/secret.xml && virsh secret-set-value --secret {{ ceph_uuid }} --base64 $(cat client.cinder.key)"
when: inventory_hostname in groups['compute']
tags:
- ceph_copy_secret
diff --git a/deploy/adapters/ansible/roles/ceph-openstack/templates/secret.j2 b/deploy/adapters/ansible/roles/ceph-openstack/templates/secret.j2
index a0ffc6e3..0195e099 100644
--- a/deploy/adapters/ansible/roles/ceph-openstack/templates/secret.j2
+++ b/deploy/adapters/ansible/roles/ceph-openstack/templates/secret.j2
@@ -1,5 +1,5 @@
<secret ephemeral='no' private='no'>
- <uuid>{{ ceph_uuid.stdout_lines[0] }}</uuid>
+ <uuid>{{ ceph_uuid }}</uuid>
<usage type='ceph'>
<name>client.cinder secret</name>
</usage>
diff --git a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml
index e7e4a242..ff99d68a 100644
--- a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml
+++ b/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml
@@ -11,6 +11,11 @@
- name: create osd lv and mount it on /var/local/osd
script: create_osd.sh
+- name: fetch osd keyring from ceph_adm
+ fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes
+ delegate_to: "{{ public_vip.ip }}"
+ when: compute_expansion
+
- name: copy osd keyring
copy: src="/tmp/ceph.osd.keyring" dest="/var/lib/ceph/bootstrap-osd/ceph.keyring"
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index adc936fc..4c6ba3fe 100755
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -70,8 +70,27 @@ function _inject_dashboard_conf() {
done
}
+function _inject_ceph_expansion_conf() {
+ for os in mitaka mitaka_xenial newton_xenial osp9; do
+ CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars
+ if [[ "$EXPANSION" == "true" ]]; then
+ cmd="
+ sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ echo compute_expansion: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ "
+ else
+ cmd="
+ sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ echo compute_expansion: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ "
+ fi
+ exec_cmd_on_compass $cmd
+ done
+}
+
function inject_compass_conf() {
_inject_dashboard_conf
+ _inject_ceph_expansion_conf
}
function refresh_compass_core () {
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network.yml b/deploy/conf/hardware_environment/huawei-pod5/network.yml
index 9d3eea1b..543fec39 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network.yml
@@ -13,7 +13,7 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
interface: eth1
- vlan_tag: 125
+ vlan_tag: 3011
type: vlan
role:
- controller
@@ -21,7 +21,7 @@ sys_intf_mappings:
- name: storage
interface: eth1
- vlan_tag: 126
+ vlan_tag: 3012
type: vlan
role:
- controller
@@ -55,10 +55,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.145.140.10"
- - "10.145.140.50"
- cidr: "10.145.140.0/24"
- gw: "10.145.140.1"
+ - - "192.168.5.204"
+ - "192.168.5.210"
+ cidr: "192.168.5.0/24"
+ gw: "192.168.5.1"
role:
- controller
- compute
@@ -69,7 +69,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 10.145.140.115
+ ip: 192.168.5.211
netmask: "24"
interface: external
@@ -84,7 +84,7 @@ public_net_info:
router: router-ext
enable_dhcp: False
no_gateway: False
- external_gw: "10.145.140.1"
- floating_ip_cidr: "10.145.140.0/24"
- floating_ip_start: "10.145.140.100"
- floating_ip_end: "10.145.140.200"
+ external_gw: "192.168.5.1"
+ floating_ip_cidr: "192.168.5.0/24"
+ floating_ip_start: "192.168.5.215"
+ floating_ip_end: "192.168.5.250"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
index 8f603de5..83c69a2c 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
@@ -13,7 +13,7 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
interface: eth1
- vlan_tag: 125
+ vlan_tag: 3011
type: vlan
role:
- controller
@@ -21,7 +21,7 @@ sys_intf_mappings:
- name: storage
interface: eth1
- vlan_tag: 126
+ vlan_tag: 3012
type: vlan
role:
- controller
@@ -55,10 +55,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.145.140.10"
- - "10.145.140.50"
- cidr: "10.145.140.0/24"
- gw: "10.145.140.1"
+ - - "192.168.5.204"
+ - "192.168.5.210"
+ cidr: "192.168.5.0/24"
+ gw: "192.168.5.1"
role:
- controller
- compute
@@ -69,7 +69,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 10.145.140.115
+ ip: 192.168.5.211
netmask: "24"
interface: external
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
index 69880200..43b0e67b 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
@@ -13,7 +13,7 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
interface: eth1
- vlan_tag: 125
+ vlan_tag: 3011
type: vlan
role:
- controller
@@ -21,7 +21,7 @@ sys_intf_mappings:
- name: storage
interface: eth1
- vlan_tag: 126
+ vlan_tag: 3012
type: vlan
role:
- controller
@@ -55,10 +55,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.145.140.10"
- - "10.145.140.50"
- cidr: "10.145.140.0/24"
- gw: "10.145.140.1"
+ - - "192.168.5.204"
+ - "192.168.5.210"
+ cidr: "192.168.5.0/24"
+ gw: "192.168.5.1"
role:
- controller
- compute
@@ -69,7 +69,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 10.145.140.115
+ ip: 192.168.5.211
netmask: "24"
interface: external
@@ -84,7 +84,7 @@ public_net_info:
router: router-ext
enable_dhcp: False
no_gateway: False
- external_gw: "10.145.140.1"
- floating_ip_cidr: "10.145.140.0/24"
- floating_ip_start: "10.145.140.100"
- floating_ip_end: "10.145.140.200"
+ external_gw: "192.168.5.1"
+ floating_ip_cidr: "192.168.5.0/24"
+ floating_ip_start: "192.168.5.215"
+ floating_ip_end: "192.168.5.250"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
index 56428daa..fc28e1a2 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
hosts:
- name: host1
- mac: '70:7b:e8:75:71:d3'
+ mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: '70:7b:e8:75:71:d2'
- ipmiIp: 172.31.123.2
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:8B'
+ ipmiIp: 192.168.5.173
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -20,44 +20,45 @@ hosts:
- ceph-mon
- name: host2
- mac: '70:7b:e8:75:72:21'
+ mac: 'E0:97:96:10:5A:C8'
interfaces:
- - eth1: '70:7b:e8:75:72:20'
- ipmiIp: 172.31.123.3
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5A:D0'
+ ipmiIp: 192.168.5.174
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
- ceph-mon
- name: host3
- mac: '70:7b:e8:75:71:37'
+ mac: 'E0:97:96:10:67:4D'
interfaces:
- - eth1: '70:7b:e8:75:71:36'
- ipmiIp: 172.31.123.4
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:55'
+ ipmiIp: 192.168.5.175
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
- ceph-mon
- name: host4
- mac: '70:7b:e8:75:71:dc'
+ mac: 'E0:97:96:10:5D:44'
interfaces:
- - eth1: '70:7b:e8:75:71:db'
- ipmiIp: 172.31.123.5
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5D:4C'
+ ipmiIp: 192.168.5.176
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host5
- mac: '70:7b:e8:75:71:d6'
+ mac: 'E0:97:96:10:63:29'
interfaces:
- - eth1: '70:7b:e8:75:71:d5'
- ipmiIp: 172.31.123.6
- ipmiPass: root
+ - eth1: 'E0:97:96:10:63:31'
+ ipmiIp: 192.168.5.177
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
index 65f31383..9744164f 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
hosts:
- name: host1
- mac: '70:7b:e8:75:71:d3'
+ mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: '70:7b:e8:75:71:d2'
- ipmiIp: 172.31.123.2
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:8B'
+ ipmiIp: 192.168.5.173
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -21,41 +21,41 @@ hosts:
- ceph-mon
- name: host2
- mac: '70:7b:e8:75:72:21'
+ mac: 'E0:97:96:10:5A:C8'
interfaces:
- - eth1: '70:7b:e8:75:72:20'
- ipmiIp: 172.31.123.3
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5A:D0'
+ ipmiIp: 192.168.5.174
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host3
- mac: '70:7b:e8:75:71:37'
+ mac: 'E0:97:96:10:67:4D'
interfaces:
- - eth1: '70:7b:e8:75:71:36'
- ipmiIp: 172.31.123.4
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:55'
+ ipmiIp: 192.168.5.175
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host4
- mac: '70:7b:e8:75:71:dc'
+ mac: 'E0:97:96:10:5D:44'
interfaces:
- - eth1: '70:7b:e8:75:71:db'
- ipmiIp: 172.31.123.5
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5D:4C'
+ ipmiIp: 192.168.5.176
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host5
- mac: '70:7b:e8:75:71:d6'
+ mac: 'E0:97:96:10:63:29'
interfaces:
- - eth1: '70:7b:e8:75:71:d5'
- ipmiIp: 172.31.123.6
- ipmiPass: root
+ - eth1: 'E0:97:96:10:63:31'
+ ipmiIp: 192.168.5.177
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
index e19937ec..513fcb5d 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
@@ -10,11 +10,11 @@ moon: "Enable"
hosts:
- name: host1
- mac: '70:7b:e8:75:71:d3'
+ mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: '70:7b:e8:75:71:d2'
- ipmiIp: 172.31.123.2
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:8B'
+ ipmiIp: 192.168.5.173
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -23,11 +23,11 @@ hosts:
- ceph-mon
- name: host2
- mac: '70:7b:e8:75:72:21'
+ mac: 'E0:97:96:10:5A:C8'
interfaces:
- - eth1: '70:7b:e8:75:72:20'
- ipmiIp: 172.31.123.3
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5A:D0'
+ ipmiIp: 192.168.5.174
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -35,11 +35,11 @@ hosts:
- ceph-mon
- name: host3
- mac: '70:7b:e8:75:71:37'
+ mac: 'E0:97:96:10:67:4D'
interfaces:
- - eth1: '70:7b:e8:75:71:36'
- ipmiIp: 172.31.123.4
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:55'
+ ipmiIp: 192.168.5.175
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -47,22 +47,23 @@ hosts:
- ceph-mon
- name: host4
- mac: '70:7b:e8:75:71:dc'
+ mac: 'E0:97:96:10:5D:44'
interfaces:
- - eth1: '70:7b:e8:75:71:db'
- ipmiIp: 172.31.123.5
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5D:4C'
+ ipmiIp: 192.168.5.176
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host5
- mac: '70:7b:e8:75:71:d6'
+ mac: 'E0:97:96:10:63:29'
interfaces:
- - eth1: '70:7b:e8:75:71:d5'
- ipmiIp: 172.31.123.6
- ipmiPass: root
+ - eth1: 'E0:97:96:10:63:31'
+ ipmiIp: 192.168.5.177
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
index 3b01d83d..05fb2b25 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
hosts:
- name: host1
- mac: '70:7b:e8:75:71:d3'
+ mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: '70:7b:e8:75:71:d2'
- ipmiIp: 172.31.123.2
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:8B'
+ ipmiIp: 192.168.5.173
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -21,11 +21,11 @@ hosts:
- ceph-mon
- name: host2
- mac: '70:7b:e8:75:72:21'
+ mac: 'E0:97:96:10:5A:C8'
interfaces:
- - eth1: '70:7b:e8:75:72:20'
- ipmiIp: 172.31.123.3
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5A:D0'
+ ipmiIp: 192.168.5.174
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -33,11 +33,11 @@ hosts:
- ceph-mon
- name: host3
- mac: '70:7b:e8:75:71:37'
+ mac: 'E0:97:96:10:67:4D'
interfaces:
- - eth1: '70:7b:e8:75:71:36'
- ipmiIp: 172.31.123.4
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:55'
+ ipmiIp: 192.168.5.175
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -45,22 +45,23 @@ hosts:
- ceph-mon
- name: host4
- mac: '70:7b:e8:75:71:dc'
+ mac: 'E0:97:96:10:5D:44'
interfaces:
- - eth1: '70:7b:e8:75:71:db'
- ipmiIp: 172.31.123.5
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5D:4C'
+ ipmiIp: 192.168.5.176
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host5
- mac: '70:7b:e8:75:71:d6'
+ mac: 'E0:97:96:10:63:29'
interfaces:
- - eth1: '70:7b:e8:75:71:d5'
- ipmiIp: 172.31.123.6
- ipmiPass: root
+ - eth1: 'E0:97:96:10:63:31'
+ ipmiIp: 192.168.5.177
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
index dbc261a0..8835b30f 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
@@ -10,11 +10,11 @@ odl_l3_agent: "Enable"
hosts:
- name: host1
- mac: '70:7b:e8:75:71:d3'
+ mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: '70:7b:e8:75:71:d2'
- ipmiIp: 172.31.123.2
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:8B'
+ ipmiIp: 192.168.5.173
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -23,11 +23,11 @@ hosts:
- ceph-mon
- name: host2
- mac: '70:7b:e8:75:72:21'
+ mac: 'E0:97:96:10:5A:C8'
interfaces:
- - eth1: '70:7b:e8:75:72:20'
- ipmiIp: 172.31.123.3
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5A:D0'
+ ipmiIp: 192.168.5.174
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -35,11 +35,11 @@ hosts:
- ceph-mon
- name: host3
- mac: '70:7b:e8:75:71:37'
+ mac: 'E0:97:96:10:67:4D'
interfaces:
- - eth1: '70:7b:e8:75:71:36'
- ipmiIp: 172.31.123.4
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:55'
+ ipmiIp: 192.168.5.175
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -47,22 +47,23 @@ hosts:
- ceph-mon
- name: host4
- mac: '70:7b:e8:75:71:dc'
+ mac: 'E0:97:96:10:5D:44'
interfaces:
- - eth1: '70:7b:e8:75:71:db'
- ipmiIp: 172.31.123.5
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5D:4C'
+ ipmiIp: 192.168.5.176
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host5
- mac: '70:7b:e8:75:71:d6'
+ mac: 'E0:97:96:10:63:29'
interfaces:
- - eth1: '70:7b:e8:75:71:d5'
- ipmiIp: 172.31.123.6
- ipmiPass: root
+ - eth1: 'E0:97:96:10:63:31'
+ ipmiIp: 192.168.5.177
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
index cff1bcf2..8ea31401 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
hosts:
- name: host1
- mac: '70:7b:e8:75:71:d3'
+ mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: '70:7b:e8:75:71:d2'
- ipmiIp: 172.31.123.2
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:8B'
+ ipmiIp: 192.168.5.173
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -21,11 +21,11 @@ hosts:
- ceph-mon
- name: host2
- mac: '70:7b:e8:75:72:21'
+ mac: 'E0:97:96:10:5A:C8'
interfaces:
- - eth1: '70:7b:e8:75:72:20'
- ipmiIp: 172.31.123.3
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5A:D0'
+ ipmiIp: 192.168.5.174
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -33,11 +33,11 @@ hosts:
- ceph-mon
- name: host3
- mac: '70:7b:e8:75:71:37'
+ mac: 'E0:97:96:10:67:4D'
interfaces:
- - eth1: '70:7b:e8:75:71:36'
- ipmiIp: 172.31.123.4
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:55'
+ ipmiIp: 192.168.5.175
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -45,22 +45,23 @@ hosts:
- ceph-mon
- name: host4
- mac: '70:7b:e8:75:71:dc'
+ mac: 'E0:97:96:10:5D:44'
interfaces:
- - eth1: '70:7b:e8:75:71:db'
- ipmiIp: 172.31.123.5
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5D:4C'
+ ipmiIp: 192.168.5.176
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host5
- mac: '70:7b:e8:75:71:d6'
+ mac: 'E0:97:96:10:63:29'
interfaces:
- - eth1: '70:7b:e8:75:71:d5'
- ipmiIp: 172.31.123.6
- ipmiPass: root
+ - eth1: 'E0:97:96:10:63:31'
+ ipmiIp: 192.168.5.177
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
index 435d4481..0dc211af 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
@@ -10,11 +10,11 @@ onos_sfc: "Enable"
hosts:
- name: host1
- mac: '70:7b:e8:75:71:d3'
+ mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: '70:7b:e8:75:71:d2'
- ipmiIp: 172.31.123.2
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:8B'
+ ipmiIp: 192.168.5.173
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -23,11 +23,11 @@ hosts:
- ceph-mon
- name: host2
- mac: '70:7b:e8:75:72:21'
+ mac: 'E0:97:96:10:5A:C8'
interfaces:
- - eth1: '70:7b:e8:75:72:20'
- ipmiIp: 172.31.123.3
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5A:D0'
+ ipmiIp: 192.168.5.174
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -35,11 +35,11 @@ hosts:
- ceph-mon
- name: host3
- mac: '70:7b:e8:75:71:37'
+ mac: 'E0:97:96:10:67:4D'
interfaces:
- - eth1: '70:7b:e8:75:71:36'
- ipmiIp: 172.31.123.4
- ipmiPass: root
+ - eth1: 'E0:97:96:10:67:55'
+ ipmiIp: 192.168.5.175
+ ipmiPass: Huawei12#$
roles:
- controller
- ha
@@ -47,21 +47,21 @@ hosts:
- ceph-mon
- name: host4
- mac: '70:7b:e8:75:71:dc'
+ mac: 'E0:97:96:10:5D:44'
interfaces:
- - eth1: '70:7b:e8:75:71:db'
- ipmiIp: 172.31.123.5
- ipmiPass: root
+ - eth1: 'E0:97:96:10:5D:4C'
+ ipmiIp: 192.168.5.176
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
- name: host5
- mac: '70:7b:e8:75:71:d6'
+ mac: 'E0:97:96:10:63:29'
interfaces:
- - eth1: '70:7b:e8:75:71:d5'
- ipmiIp: 172.31.123.6
- ipmiPass: root
+ - eth1: 'E0:97:96:10:63:31'
+ ipmiIp: 192.168.5.177
+ ipmiPass: Huawei12#$
roles:
- compute
- ceph-osd
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 06852a42..c2023223 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -115,6 +115,10 @@ function _pre_env_setup()
cd $WORK_DIR/prepare/jh_env_package
tar -zxvf trusty-jh-ppa.tar.gz
+ if [[ ! -z /etc/apt/sources.list.d ]]; then
+ mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak
+ fi
+
if [[ -f /etc/apt/apt.conf ]]; then
mv /etc/apt/apt.conf /etc/apt/apt.conf.bak
fi
@@ -159,6 +163,10 @@ EOF
if [[ -f /etc/apt/apt.conf.bak ]]; then
mv /etc/apt/apt.conf.bak /etc/apt/apt.conf
fi
+
+ if [[ ! -z /etc/apt/sources.list.d.bak ]]; then
+ mv /etc/apt/sources.list.d.bak /etc/apt/sources.list.d
+ fi
}
function _pre_pip_setup()