aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy_ci.sh10
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml5
-rw-r--r--deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml12
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt1
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage9
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant9
-rw-r--r--deploy/adapters/ansible/roles/config-compute/vars/main.yml21
-rw-r--r--deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml12
-rw-r--r--deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt1
-rw-r--r--deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage11
-rw-r--r--deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant9
-rw-r--r--deploy/adapters/ansible/roles/config-controller/vars/main.yml21
-rwxr-xr-xdeploy/adapters/ansible/roles/config-osa/tasks/main.yml25
-rw-r--r--deploy/adapters/ansible/roles/post-osa/tasks/RedHat.yml6
-rw-r--r--deploy/adapters/ansible/roles/post-osa/templates/ifcfg-storage.j29
-rw-r--r--deploy/adapters/ansible/roles/post-osa/templates/ifcfg-tenant.j29
-rw-r--r--deploy/adapters/ansible/roles/post-osa/vars/main.yml21
-rw-r--r--deploy/adapters/ansible/roles/pre-openstack/tasks/RedHat.yml38
-rw-r--r--deploy/adapters/ansible/roles/pre-openstack/templates/ifcfg-external.j28
-rw-r--r--deploy/adapters/ansible/roles/pre-openstack/vars/main.yml34
-rw-r--r--deploy/conf/compass.conf44
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml74
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-nosdn-bar-ha.yml80
-rw-r--r--deploy/conf/hardware_environment/intel-pod17/os-nosdn-bar-ha.yml84
-rw-r--r--plugins/barometer/roles/collectd/tasks/collectd.yml2
25 files changed, 492 insertions, 63 deletions
diff --git a/ci/deploy_ci.sh b/ci/deploy_ci.sh
index 5fa19cef..bd5adcc7 100755
--- a/ci/deploy_ci.sh
+++ b/ci/deploy_ci.sh
@@ -24,10 +24,14 @@ case $DEPLOY_SCENARIO in
;;
esac
+if [[ "$NODE_NAME" =~ "intel-pod17" ]]; then
+ export USER_NAMESERVER=8.8.8.8
+fi
+
if [[ $ROOT_BUILD_CAUSE == MANUALTRIGGER ]]; then
# For manual ci trigger build, directly use the value pass from CI
export COMPASS_OS_VERSION=${COMPASS_OS_VERSION:-xenial}
- export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-newton}
+ export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-pike}
else
# For daily build or verify build, adjust COMPASS_OS_VERSION and OPENSTACK_VERSION
@@ -35,10 +39,10 @@ else
if [[ $COMPASS_OS_VERSION == centos7 ]]; then
export COMPASS_OS_VERSION=${COMPASS_OS_VERSION:-centos7}
- export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-newton}
+ export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-pike}
else
export COMPASS_OS_VERSION=${COMPASS_OS_VERSION:-xenial}
- export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-newton}
+ export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-pike}
fi
fi
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 4ca8ba97..f923d0d3 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -48,6 +48,11 @@
remote_user: root
roles:
- post-osa
+
+- hosts:
+ - compute
+ remote_user: root
+ roles:
- collectd
- hosts:
diff --git a/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml b/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml
index 3ec1659f..ff91393d 100644
--- a/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml
+++ b/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml
@@ -14,20 +14,19 @@
shell: "echo 'nfs 2049/tcp' >> /etc/services; \
echo 'nfs 2049/udp' >> /etc/services"
-# yamllint disable rule:line-length
- name: generate ifcfg-if.tenant
template:
src: ifcfg-if.tenant
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_tenant }}
- name: generate ifcfg-if.storage
template:
src: ifcfg-if.storage
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_storage }}
- name: add br-external to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["external"]["interface"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_external }}
line: "BRIDGE=br-external"
- name: remove eth0 ip addresss
@@ -49,14 +48,13 @@
- name: add br-vlan to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_storage }}
line: "BRIDGE=br-storage"
- name: add br-tenant to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_tenant }}
line: "BRIDGE=br-tenant"
-# yamllint enable rule:line-length
- name: generate ifcfg-br-mgmt script
template:
diff --git a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt
index 2e958cc7..184f752b 100644
--- a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt
+++ b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt
@@ -5,3 +5,4 @@ PREFIX=24
BOOTPROTO=none
ONBOOT=yes
DELAY=0
+DEFROUTE="no"
diff --git a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage
index 2e409205..eecc7a42 100644
--- a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage
+++ b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage
@@ -1,4 +1,9 @@
-DEVICE={{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}}
+DEVICE={{ intf_storage }}
BOOTPROTO=none
ONBOOT=yes
-VLAN=yes
+{% if compu_sys_mappings["storage"]["vlan_tag"] | int %}
+{% set intf_vlan = "yes" %}
+{% else %}
+{% set intf_vlan = "no" %}
+{% endif %}
+VLAN={{ intf_vlan }}
diff --git a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
index 2a114f7c..b36fa105 100644
--- a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
+++ b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
@@ -1,4 +1,9 @@
-DEVICE={{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+DEVICE={{ intf_tenant }}
BOOTPROTO=none
ONBOOT=yes
-VLAN=yes
+{% if compu_sys_mappings["tenant"]["vlan_tag"] | int %}
+{% set intf_vlan = "yes" %}
+{% else %}
+{% set intf_vlan = "no" %}
+{% endif %}
+VLAN={{ intf_vlan }}
diff --git a/deploy/adapters/ansible/roles/config-compute/vars/main.yml b/deploy/adapters/ansible/roles/config-compute/vars/main.yml
index 783ea0d0..b157f910 100644
--- a/deploy/adapters/ansible/roles/config-compute/vars/main.yml
+++ b/deploy/adapters/ansible/roles/config-compute/vars/main.yml
@@ -8,3 +8,24 @@
# #############################################################################
---
LOCAL_REPOSITORY_IP: "192.168.137.222"
+
+intf_external: |-
+ {%- set intf_external = compu_sys_mappings["external"]["interface"] %}
+ {%- if compu_sys_mappings["external"]["vlan_tag"] | int %}
+ {%- set intf_external = intf_external + '.' + compu_sys_mappings["external"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_external }}
+
+intf_tenant: |-
+ {%- set intf_tenant = compu_sys_mappings["tenant"]["interface"] %}
+ {%- if compu_sys_mappings["tenant"]["vlan_tag"] | int %}
+ {%- set intf_tenant = intf_tenant + '.' + compu_sys_mappings["tenant"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_tenant }}
+
+intf_storage: |-
+ {%- set intf_storage = compu_sys_mappings["storage"]["interface"] %}
+ {%- if compu_sys_mappings["storage"]["vlan_tag"] | int %}
+ {%- set intf_storage = intf_storage + '.' + compu_sys_mappings["storage"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_storage }}
diff --git a/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml b/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml
index cc14347a..58bc2bf7 100644
--- a/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml
+++ b/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml
@@ -7,32 +7,30 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
-# yamllint disable rule:line-length
- name: generate tenant vlan ifcfg-if script
template:
src: ifcfg-if.tenant
- dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["tenant"]["interface"]}}.{{contr_sys_mappings["tenant"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_tenant }}
- name: generate storage vlan ifcfg-if script
template:
src: ifcfg-if.storage
- dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["storage"]["interface"]}}.{{contr_sys_mappings["storage"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_storage }}
- name: add br-external to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["external"]["interface"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_external }}
line: "BRIDGE=br-external"
- name: add br-storage to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["storage"]["interface"]}}.{{contr_sys_mappings["storage"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_storage }}
line: "BRIDGE=br-storage"
- name: add br-tenant to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["tenant"]["interface"]}}.{{contr_sys_mappings["tenant"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_tenant }}
line: "BRIDGE=br-tenant"
-# yamllint enable rule:line-length
- name: remove eth0 ip addresss
lineinfile:
diff --git a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt
index 2e958cc7..184f752b 100644
--- a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt
+++ b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt
@@ -5,3 +5,4 @@ PREFIX=24
BOOTPROTO=none
ONBOOT=yes
DELAY=0
+DEFROUTE="no"
diff --git a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage
index b71a80cf..c0a14049 100644
--- a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage
+++ b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage
@@ -1,4 +1,9 @@
-DEVICE={{contr_sys_mappings["storage"]["interface"]}}.{{contr_sys_mappings["storage"]["vlan_tag"]}}
-BOOTPROTO=none
+DEVICE={{ intf_storage }}
ONBOOT=yes
-VLAN=yes
+{% if contr_sys_mappings["storage"]["vlan_tag"] | int %}
+{% set intf_vlan = "yes" %}
+{% else %}
+{% set intf_vlan = "no" %}
+{% endif %}
+VLAN={{ intf_vlan }}
+BOOTPROTO=none
diff --git a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant
index bc9f2a57..b45c001f 100644
--- a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant
+++ b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant
@@ -1,4 +1,9 @@
-DEVICE={{contr_sys_mappings["tenant"]["interface"]}}.{{contr_sys_mappings["tenant"]["vlan_tag"]}}
+DEVICE={{ intf_tenant }}
BOOTPROTO=none
ONBOOT=yes
-VLAN=yes
+{% if contr_sys_mappings["tenant"]["vlan_tag"] | int %}
+{% set intf_vlan = "yes" %}
+{% else %}
+{% set intf_vlan = "no" %}
+{% endif %}
+VLAN={{ intf_vlan }}
diff --git a/deploy/adapters/ansible/roles/config-controller/vars/main.yml b/deploy/adapters/ansible/roles/config-controller/vars/main.yml
index 783ea0d0..701ec52b 100644
--- a/deploy/adapters/ansible/roles/config-controller/vars/main.yml
+++ b/deploy/adapters/ansible/roles/config-controller/vars/main.yml
@@ -8,3 +8,24 @@
# #############################################################################
---
LOCAL_REPOSITORY_IP: "192.168.137.222"
+
+intf_external: |-
+ {%- set intf_external = contr_sys_mappings["external"]["interface"] %}
+ {%- if contr_sys_mappings["external"]["vlan_tag"] | int %}
+ {%- set intf_external = intf_external + '.' + contr_sys_mappings["external"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_external }}
+
+intf_tenant: |-
+ {%- set intf_tenant = contr_sys_mappings["tenant"]["interface"] %}
+ {%- if contr_sys_mappings["tenant"]["vlan_tag"] | int %}
+ {%- set intf_tenant = intf_tenant + '.' + contr_sys_mappings["tenant"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_tenant }}
+
+intf_storage: |-
+ {%- set intf_storage = contr_sys_mappings["storage"]["interface"] %}
+ {%- if contr_sys_mappings["storage"]["vlan_tag"] | int %}
+ {%- set intf_storage = intf_storage + '.' + contr_sys_mappings["storage"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_storage }}
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 046b25e5..75e89b06 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -53,6 +53,19 @@
insertafter: '^ - qemu-img-ev'
line: ' - libvirt'
+- name: fix the problem of nova cell_v2 discovery
+ blockinfile:
+ dest: /etc/ansible/roles/os_nova/tasks/nova_db_post_setup.yml
+ insertafter: 'nova-manage cell_v2 discover_hosts'
+ block: |
+ # add retry
+ register: cell_v2_discovery
+ until: cell_v2_discovery == 0
+ retries: 10
+ delay: 5
+ ignore_errors: true
+ when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'Ubuntu'
+
- name: remove CentOS-Base.repo after ceph-osd
blockinfile:
dest: /etc/ansible/roles/ceph-osd/tasks/start_osds.yml
@@ -63,6 +76,18 @@
/etc/yum.repos.d/CentOS-Base.repo.bak;
when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'CentOS'
+- name: fix the problem in pip_install
+ blockinfile:
+ dest: /etc/ansible/roles/pip_install/tasks/pre_install_yum.yml
+ insertafter: 'pip_install_package_state'
+ block: |
+ # add retry
+ register: repo_result
+ until: repo_result | success
+ retries: 5
+ delay: 10
+ when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'CentOS'
+
- name: add mariadb local repository
blockinfile:
dest: /etc/openstack_deploy/user_variables.yml
diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/RedHat.yml b/deploy/adapters/ansible/roles/post-osa/tasks/RedHat.yml
index 287fd515..dce89ef8 100644
--- a/deploy/adapters/ansible/roles/post-osa/tasks/RedHat.yml
+++ b/deploy/adapters/ansible/roles/post-osa/tasks/RedHat.yml
@@ -33,17 +33,17 @@
- name: generate ifcfg-external
template:
src: ifcfg-external.j2
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["external"]["interface"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_external }}
- name: generate ifcfg-storage
template:
src: ifcfg-storage.j2
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_storage }}
- name: generate ifcfg-tenant
template:
src: ifcfg-tenant.j2
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_tenant }}
# yamllint enable rule:line-length
diff --git a/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-storage.j2 b/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-storage.j2
index 338da8c4..98cce6cb 100644
--- a/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-storage.j2
+++ b/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-storage.j2
@@ -1,7 +1,12 @@
-DEVICE={{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}}
+DEVICE={{ intf_storage }}
BOOTPROTO=none
ONBOOT=yes
-VLAN=yes
IPADDR={{ ip_settings[inventory_hostname]["storage"]["ip"] }}
NETMASK=255.255.255.0
DEFROUTE="no"
+{% if contr_sys_mappings["storage"]["vlan_tag"] | int %}
+{% set intf_vlan = "yes" %}
+{% else %}
+{% set intf_vlan = "no" %}
+{% endif %}
+VLAN={{ intf_vlan }}
diff --git a/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-tenant.j2 b/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-tenant.j2
index 15230c96..fce9b572 100644
--- a/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-tenant.j2
+++ b/deploy/adapters/ansible/roles/post-osa/templates/ifcfg-tenant.j2
@@ -1,7 +1,12 @@
-DEVICE={{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+DEVICE={{ intf_tenant }}
BOOTPROTO=none
ONBOOT=yes
-VLAN=yes
IPADDR={{ ip_settings[inventory_hostname]["tenant"]["ip"] }}
NETMASK=255.255.255.0
DEFROUTE="no"
+{% if contr_sys_mappings["tenant"]["vlan_tag"] | int %}
+{% set intf_vlan = "yes" %}
+{% else %}
+{% set intf_vlan = "no" %}
+{% endif %}
+VLAN={{ intf_vlan }}
diff --git a/deploy/adapters/ansible/roles/post-osa/vars/main.yml b/deploy/adapters/ansible/roles/post-osa/vars/main.yml
index 4feb9756..da886028 100644
--- a/deploy/adapters/ansible/roles/post-osa/vars/main.yml
+++ b/deploy/adapters/ansible/roles/post-osa/vars/main.yml
@@ -3,3 +3,24 @@
sfc_plugins:
src: sfc.conf
dst: /opt/sfc.conf
+
+intf_external: |-
+ {%- set intf_external = compu_sys_mappings["external"]["interface"] %}
+ {%- if compu_sys_mappings["external"]["vlan_tag"] | int %}
+ {%- set intf_external = intf_external + '.' + compu_sys_mappings["external"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_external }}
+
+intf_tenant: |-
+ {%- set intf_tenant = compu_sys_mappings["tenant"]["interface"] %}
+ {%- if compu_sys_mappings["tenant"]["vlan_tag"] | int %}
+ {%- set intf_tenant = intf_tenant + '.' + compu_sys_mappings["tenant"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_tenant }}
+
+intf_storage: |-
+ {%- set intf_storage = compu_sys_mappings["storage"]["interface"] %}
+ {%- if compu_sys_mappings["storage"]["vlan_tag"] | int %}
+ {%- set intf_storage = intf_storage + '.' + compu_sys_mappings["storage"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_storage }}
diff --git a/deploy/adapters/ansible/roles/pre-openstack/tasks/RedHat.yml b/deploy/adapters/ansible/roles/pre-openstack/tasks/RedHat.yml
index 5456c9fc..6ac191a3 100644
--- a/deploy/adapters/ansible/roles/pre-openstack/tasks/RedHat.yml
+++ b/deploy/adapters/ansible/roles/pre-openstack/tasks/RedHat.yml
@@ -49,6 +49,30 @@
- /tmp/ssh-keys-*
- /root/.ssh/id_rsa.pub
+- name: configure BOOTPROTO to static
+ replace:
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ compu_sys_mappings["external"]["interface"] }}
+ regexp: 'BOOTPROTO=.*'
+ replace: 'BOOTPROTO=static'
+
+- name: remove default route for mgmt
+ lineinfile:
+ dest: /etc/sysconfig/network-scripts/ifcfg-eth0
+ line: "DEFROUTE=\"no\""
+
+- name: backup external configure
+ shell: |
+ mv /etc/sysconfig/network-scripts/ifcfg-{{ compu_sys_mappings["external"]["interface"] }} \
+ /home/ifcfg-{{ compu_sys_mappings["external"]["interface"] }}
+
+- name: configure external network
+ template:
+ src: ifcfg-external.j2
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["external"]["interface"]}}
+
+- name: restart network
+ shell: systemctl restart network
+
- name: change sources(yum) list
copy:
src: centos_base.repo
@@ -75,3 +99,17 @@
- name: restart ssh service
shell: service sshd restart
+
+- name: recovery external configure
+ shell: |
+ mv /home/ifcfg-{{ compu_sys_mappings["external"]["interface"] }} \
+ /etc/sysconfig/network-scripts/ifcfg-{{ compu_sys_mappings["external"]["interface"] }}
+
+- name: add default route for mgmt
+ lineinfile:
+ dest: /etc/sysconfig/network-scripts/ifcfg-eth0
+ regexp: "^DEFROUTE=\"no\""
+ state: absent
+
+- name: restart network
+ shell: systemctl restart network
diff --git a/deploy/adapters/ansible/roles/pre-openstack/templates/ifcfg-external.j2 b/deploy/adapters/ansible/roles/pre-openstack/templates/ifcfg-external.j2
new file mode 100644
index 00000000..05ad69f7
--- /dev/null
+++ b/deploy/adapters/ansible/roles/pre-openstack/templates/ifcfg-external.j2
@@ -0,0 +1,8 @@
+DEVICE={{compu_sys_mappings["external"]["interface"]}}
+ONBOOT=yes
+BOOTPROTO=static
+TYPE=Ethernet
+IPADDR={{ ip_settings[inventory_hostname]["external"]["ip"] }}
+GATEWAY={{ ip_settings[inventory_hostname]["external"]["gw"] }}
+NETMASK=255.255.255.0
+DEFROUTE=yes
diff --git a/deploy/adapters/ansible/roles/pre-openstack/vars/main.yml b/deploy/adapters/ansible/roles/pre-openstack/vars/main.yml
index f44a9f9f..1b8c238b 100644
--- a/deploy/adapters/ansible/roles/pre-openstack/vars/main.yml
+++ b/deploy/adapters/ansible/roles/pre-openstack/vars/main.yml
@@ -1,20 +1,22 @@
---
aptpackages:
-- bridge-utils
-- debootstrap
-- ifenslave
-- ifenslave-2.6
-- lsof
-- lvm2
-- ntp
-- ntpdate
-- sudo
-- vlan
-- tcpdump
+ - bridge-utils
+ - debootstrap
+ - ifenslave
+ - ifenslave-2.6
+ - lsof
+ - lvm2
+ - ntp
+ - ntpdate
+ - sudo
+ - vlan
+ - tcpdump
yumpackages:
-- bridge-utils
-- iputils
-- lvm2
-- ntp
-- tcpdump
+ - bridge-utils
+ - iputils
+ - lvm2
+ - ntp
+ - tcpdump
+ - net-tools
+ - vim
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 8a3bb3a3..78dd141b 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -18,19 +18,37 @@ export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
export COMPASS_REPO_PORT="5151"
export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
-# Set docker registry for architectures other than x86_64
-COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-compass4nfv}
+if [ "$COMPASS_ARCH" = "aarch64" ]; then
+ # Docker images for aarch64
-export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
-# export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa:euphrates"
-export COMPASS_TASKS="yifei0van0xue/compass-tasks-osa"
+ # Arm images are temporarily held at dockerhub linaro repo
+ COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-linaro}
-if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
- export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
-fi
+ export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
+ export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa"
+
+ if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
+ export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
+ fi
+
+ export COMPASS_DB="$COMPASS_DOCKER_REPO/compass-db"
+ export COMPASS_MQ="$COMPASS_DOCKER_REPO/compass-mq"
+ export COMPASS_REPO="$COMPASS_DOCKER_REPO/compass-repo-osa-ubuntu:euphrates"
+ export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
+
+else
+ # Docker images for x86_64
-# export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
-export COMPASS_DB="$COMPASS_DOCKER_REPO/compass-db"
-export COMPASS_MQ="$COMPASS_DOCKER_REPO/compass-mq"
-export COMPASS_REPO="$COMPASS_DOCKER_REPO/compass-repo-osa-ubuntu:euphrates"
-export COMPASS_COBBLER="yifei0van0xue/compass-cobbler"
+ export COMPASS_DECK="compass4nfv/compass-deck"
+ export COMPASS_TASKS="yifei0van0xue/compass-tasks-osa"
+
+ if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
+ export COMPASS_TASKS="compass4nfv/compass-tasks-k8s"
+ fi
+
+ export COMPASS_DB="compass4nfv/compass-db"
+ export COMPASS_MQ="compass4nfv/compass-mq"
+ export COMPASS_REPO="compass4nfv/compass-repo-osa-ubuntu:euphrates"
+ export COMPASS_COBBLER="yifei0van0xue/compass-cobbler"
+
+fi
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml
new file mode 100644
index 00000000..59e7180a
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml
@@ -0,0 +1,74 @@
+##############################################################################
+# Copyright (c) 2016 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
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+plugins:
+ - barometer: "Enable"
+
+hosts:
+ - name: host1
+ mac: 'F8:4A:BF:55:A2:8D'
+ interfaces:
+ - eth1: 'F8:4A:BF:55:A2:8E'
+ ipmiIp: 172.16.130.26
+ ipmiPass: Opnfv@pod1
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: 'D8:49:0B:DA:5A:B7'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:5A:B8'
+ ipmiIp: 172.16.130.27
+ ipmiPass: Opnfv@pod1
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ mac: '78:D7:52:A0:B1:99'
+ interfaces:
+ - eth1: '78:D7:52:A0:B1:9A'
+ ipmiIp: 172.16.130.29
+ ipmiPass: Opnfv@pod1
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ mac: 'D8:49:0B:DA:5B:5D'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:5B:5E'
+ ipmiIp: 172.16.130.30
+ ipmiPass: Opnfv@pod1
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: 'D8:49:0B:DA:56:85'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:56:86'
+ ipmiIp: 172.16.130.31
+ ipmiPass: Opnfv@pod1
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-bar-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-bar-ha.yml
new file mode 100644
index 00000000..d9a68dc3
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-bar-ha.yml
@@ -0,0 +1,80 @@
+##############################################################################
+# Copyright (c) 2016 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
+##############################################################################
+
+---
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiVer: '2.0'
+
+
+plugins:
+ - barometer: "Enable"
+
+hosts:
+ - name: host1
+ mac: 'EC:38:8F:79:0C:2C'
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ ipmiIp: 172.16.130.20
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:2D'
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: 'EC:38:8F:79:0C:48'
+ ipmiIp: 172.16.130.19
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:49'
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ mac: 'EC:38:8F:79:10:CC'
+ ipmiIp: 172.16.130.18
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:79:10:CD'
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ mac: 'EC:38:8F:79:0C:6C'
+ ipmiIp: 172.16.130.17
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:6D'
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: 'EC:38:8F:7A:E6:ED'
+ ipmiIp: 172.16.130.16
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:7A:E6:EE'
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod17/os-nosdn-bar-ha.yml b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-bar-ha.yml
new file mode 100644
index 00000000..42f912c7
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-bar-ha.yml
@@ -0,0 +1,84 @@
+##############################################################################
+# Copyright (c) 2016 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
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+plugins:
+ - barometer: "Enable"
+
+hosts:
+ - name: host1
+ mac: 'A4:BF:01:16:31:DD'
+ interfaces:
+ - eth1: 'A4:BF:01:16:31:DC'
+ - eth2: '3C:FD:FE:A4:9C:D0'
+ - eth3: '3C:FD:FE:A4:9C:D1'
+ ipmiIp: 10.10.170.11
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: 'A4:BF:01:14:01:13'
+ interfaces:
+ - eth1: 'A4:BF:01:14:01:12'
+ - eth2: '3C:FD:FE:A4:9D:20'
+ - eth3: '3C:FD:FE:A4:9D:21'
+ ipmiIp: 10.10.170.12
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ mac: 'A4:BF:01:14:71:1E'
+ interfaces:
+ - eth1: 'A4:BF:01:14:71:1D'
+ - eth2: '3C:FD:FE:A4:A0:78'
+ - eth3: '3C:FD:FE:A4:A0:79'
+ ipmiIp: 10.10.170.13
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ mac: 'A4:BF:01:16:2F:17'
+ interfaces:
+ - eth1: 'A4:BF:01:16:2F:16'
+ - eth2: '3C:FD:FE:A4:9D:00'
+ - eth3: '3C:FD:FE:A4:9D:01'
+ ipmiIp: 10.10.170.14
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: 'A4:BF:01:14:2B:BB'
+ interfaces:
+ - eth1: 'A4:BF:01:14:2B:BA'
+ - eth2: '3C:FD:FE:A4:A0:68'
+ - eth3: '3C:FD:FE:A4:A0:69'
+ ipmiIp: 10.10.170.15
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
diff --git a/plugins/barometer/roles/collectd/tasks/collectd.yml b/plugins/barometer/roles/collectd/tasks/collectd.yml
index 5a2c3710..48e15989 100644
--- a/plugins/barometer/roles/collectd/tasks/collectd.yml
+++ b/plugins/barometer/roles/collectd/tasks/collectd.yml
@@ -55,7 +55,7 @@
cd /opt/stack;
git clone https://github.com/openstack/collectd-ceilometer-plugin.git;
cd /opt/stack/collectd-ceilometer-plugin;
- git checkout stable/ocata
+ git checkout stable/pike
when: stat_result.stat.exists == False
- name: configure logfile conf