-h Print this message and exit
-l Lab-name
-p Pod-name
+ -P Skip installation of package dependencies
-s Deploy-scenario short-name
-S Storage dir for VM images
-L Deployment log path and file name
-L Deployment log path and name, eg. -L /home/jenkins/job.log.tar.gz
-l Lab name as defined in the configuration directory, e.g. lf
-p POD name as defined in the configuration directory, e.g. pod2
+-P Skip installing dependency distro packages on current host
+ This flag should only be used if you have kept back older packages that
+ would be upgraded and that is undesirable on the current system.
+ Note that without the required packages, deploy will fail.
-s Deployment-scenario, this points to a short deployment scenario name, which
has to be defined in config directory (e.g. os-odl-nofeature-ha).
-S Storage dir for VM images, default is mcp/deploy/images
# Customize deploy workflow
DRY_RUN=${DRY_RUN:-0}
+USE_EXISTING_PKGS=${USE_EXISTING_PKGS:-0}
USE_EXISTING_INFRA=${USE_EXISTING_INFRA:-0}
INFRA_CREATION_ONLY=${INFRA_CREATION_ONLY:-0}
NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0}
#
set +x
OPNFV_BRIDGE_IDX=0
-while getopts "b:B:dDfEFl:L:p:s:S:he" OPTION
+while getopts "b:B:dDfEFl:L:p:Ps:S:he" OPTION
do
case $OPTION in
b)
DEPLOY_TYPE='virtual'
fi
;;
+ P)
+ USE_EXISTING_PKGS=1
+ ;;
s)
DEPLOY_SCENARIO=${OPTARG}
;;
# Prepare the deploy config files based on lab/pod information, deployment
# scenario, etc.
-# Install required packages
-[ -n "$(command -v apt-get)" ] && sudo apt-get install -y \
- git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime \
- libvirt-bin cloud-guest-utils e2fsprogs kpartx
-[ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \
- git make rsync genisoimage curl virt-install qemu-kvm util-linux \
- libvirt cloud-utils-growpart e2fsprogs kpartx
-
-# For baremetal, python is indirectly required for PDF parsing
-if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
- [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \
- python python-ipaddress python-jinja2 python-yaml
- [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \
- python python-ipaddress python-jinja2 python-yaml
-fi
-
-# AArch64 VMs use AAVMF (guest UEFI)
-if [ "$(uname -m)" = 'aarch64' ]; then
- [ -n "$(command -v apt-get)" ] && sudo apt-get install -y qemu-efi
- [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken AAVMF
+# Install required packages on jump server
+if [ ${USE_EXISTING_PKGS} -eq 1 ]; then
+ notify "[NOTE] Skipping distro pkg installation\n" 2 1>&2
+else
+ notify "[NOTE] Installing required distro pkgs\n" 2 1>&2
+ if [ -n "$(command -v apt-get)" ]; then
+ pkg_type='deb'; pkg_cmd='sudo apt-get install -y'
+ else
+ pkg_type='rpm'; pkg_cmd='sudo yum install -y --skip-broken'
+ fi
+ eval "$(parse_yaml "./requirements_${pkg_type}.yaml")"
+ for section in 'common' "${DEPLOY_TYPE}" "$(uname -m)"; do
+ section_var="requirements_pkg_${section}[*]"
+ pkg_list+=" ${!section_var}"
+ done
+ # shellcheck disable=SC2086
+ ${pkg_cmd} ${pkg_list}
fi
if ! virsh list >/dev/null 2>&1; then
- CentOS 7 (recommended by Pharos specification);
- Ubuntu Xenial;
-**NOTE:** The install script expects 'libvirt' to be installed and running
-on the Jumpserver. In case the packages are missing, the script will install
+**NOTE:** The install script will automatically install all required distro
+package dependencies on the Jumpserver, unless explicitly asked not to
+(via `-P` deploy arg). This includes Python, QEMU, libvirt etc.
+
+**NOTE:** The install script expects 'libvirt' to be already running on the
+Jumpserver. In case libvirt packages are missing, the script will install
them; but depending on the OS distribution, the user might have to start the
-'libvirtd' service manually.
+'libvirtd' service manually, then run the deploy script again.
==========================================
OPNFV Software Installation and Deployment
| **Project** | fuel/armband |
| | |
+--------------------------------------+--------------------------------------+
-| **Repo/tag** | opnfv-5.0.2 |
+| **Repo/tag** | opnfv-5.1.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release designation** | Euphrates 5.0 |
+| **Release designation** | Euphrates 5.1 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | October 20 2017 |
+| **Release date** | December 15 2017 |
| | |
+--------------------------------------+--------------------------------------+
| **Purpose of the delivery** | Euphrates alignment to Released |
Module Version Changes
----------------------
-This is the Euphrates 5.0 release.
+This is the Euphrates 5.1 release.
It is based on following upstream versions:
- MCP 1.0 Base Release
Document Changes
----------------
-This is the Euphrates 5.0 release.
+This is the Euphrates 5.1 release.
It comes with the following documentation:
-- Installation instructions
+- `Installation instructions <http://docs.opnfv.org/en/stable-euphrates/submodules/armband/docs/release/installation/installation.instruction.html>`_
- Release notes (This document)
+- `User guide <http://docs.opnfv.org/en/stable-euphrates/submodules/fuel/docs/release/userguide/userguide.html>`_
+
Reason for Version
==================
-----------------
**JIRA TICKETS:**
-`Euphrates 5.0 new features <https://jira.opnfv.org/issues/?filter=12029>`_
+`Euphrates 5.1 new features <https://jira.opnfv.org/issues/?filter=12114>`_
Bug Corrections
---------------
**JIRA TICKETS:**
-`Euphrates 5.0 bug fixes <https://jira.opnfv.org/issues/?filter=12027>`_
+`Euphrates 5.1 bug fixes <https://jira.opnfv.org/issues/?filter=12115>`_
(Also See respective Integrated feature project's bug tracking)
Documentation Deliverables
--------------------------
-- Installation instructions
+- `Installation instructions <http://docs.opnfv.org/en/stable-euphrates/submodules/armband/docs/release/installation/installation.instruction.html>`_
- Release notes (This document)
+- `User guide <http://docs.opnfv.org/en/stable-euphrates/submodules/fuel/docs/release/userguide/userguide.html>`_
+
+
=========================================
Known Limitations, Issues and Workarounds
=========================================
**JIRA TICKETS:**
-`Known issues <https://jira.opnfv.org/issues/?filter=12028>`_
+`Known issues <https://jira.opnfv.org/issues/?filter=12116>`_
(Also See respective Integrated feature project's bug tracking)
============
Test Results
============
-The Euphrates 5.0 release with the Fuel deployment tool has undergone QA test
+The Euphrates 5.1 release with the Fuel deployment tool has undergone QA test
runs, see separate test results.
==========
References
==========
-For more information on the OPNFV Euphrates 5.0 release, please see:
+For more information on the OPNFV Euphrates 5.1 release, please see:
OPNFV
=====
"tee /dev/stderr | grep -Fq 'Not connected'"
salt -C 'kvm* or cmp*' state.apply linux,ntp,salt.minion
+salt -C 'kvm* or cmp*' pkg.upgrade refresh=False
fi
# KVM libvirt first, VCP deployment
-#FIXME Should be removed once upstream patch get merged
-salt -C 'kvm*' group.add libvirtd
wait_for 5 "salt -C 'kvm*' state.sls libvirt"
salt -C 'kvm* or cmp*' state.apply salt
+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Mirantis Inc., Enea AB 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
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 19 Oct 2017 02:03:01 +0200
-Subject: [PATCH] service.horizon.server.cluster: Default to v2 API
-
-Horizon service definition hardcodes the API version to v3, and
-also overrides the value in our reclass model during interpolation.
-Adjust the default to '2'.
-
-Signed-off-by: Ting Wu <ting.wu@enea.com>
-Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
-
-diff --git a/service/horizon/server/cluster.yml b/service/horizon/server/cluster.yml
---- a/service/horizon/server/cluster.yml
-+++ b/service/horizon/server/cluster.yml
-@@ -6,7 +6,7 @@
- _param:
- horizon_version: liberty
- horizon_identity_host: localhost
-- horizon_identity_version: 3
-+ horizon_identity_version: 2
- horizon_identity_encryption: none
- horizon_identity_endpoint_type: internalURL
- horizon:
--- /dev/null
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sun, 20 Aug 2017 02:03:01 +0200
+Subject: [PATCH] libvirt: unix_sock_group: s/libvirtd/libvirt/
+
+For Pike, libvirt 3.x is used, which uses "libvirt" by default.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+
+diff --git a/libvirt/files/libvirtd.conf.Debian b/libvirt/files/libvirtd.conf.Debian
+--- a/libvirt/files/libvirtd.conf.Debian
++++ b/libvirt/files/libvirtd.conf.Debian
+@@ -81,7 +81,7 @@
+ # without becoming root.
+ #
+ # This is restricted to 'root' by default.
+-unix_sock_group = "libvirtd"
++unix_sock_group = "libvirt"
+
+ # Set the UNIX socket permissions for the R/O socket. This is used
+ # for monitoring VM status only
/usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
/usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
-/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
+/usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
##############################################################################
---
classes:
+ - system.linux.system.repo.glusterfs
- service.keepalived.cluster.single
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
parameters:
_param:
linux_system_codename: xenial
+ glusterfs_version: '3.13'
cluster_vip_address: ${_param:infra_kvm_address}
cluster_node01_address: ${_param:infra_kvm_node01_address}
cluster_node02_address: ${_param:infra_kvm_node02_address}
##############################################################################
---
classes:
+ - system.linux.system.repo.glusterfs
- system.linux.storage.loopback
- system.glusterfs.client.cluster
- system.nova.compute.cluster
keepalived_vip_virtual_router_id: 69
loopback_device_size: 20
linux_system_codename: xenial
+ glusterfs_version: '3.13'
# {dhcp,single}_nic are not used, but referenced
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
{%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%}
{%- set vlan_private = conf['net_config']['private']['vlan'] -%}
{%- set vlan_public = conf['net_config']['public']['vlan'] -%}
-
- {%- set gateway_public = conf['net_config']['public']['gateway'] -%}
{%- else -%}
{%- set nic_admin = 'enp6s0' -%}
{%- set nic_mgmt = 'enp6s0' -%}
{%- endif -%}
{#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#}
-{%- set nics = { nic_admin: True, nic_mgmt: True, nic_public: True} -%}
+{%- set nics = { nic_admin: True, nic_mgmt: True } -%}
-{%- set vlans = { vlan_admin: nic_admin, vlan_mgmt: nic_mgmt, vlan_public: nic_public} -%}
+{%- set vlans = { vlan_admin: nic_admin, vlan_mgmt: nic_mgmt } -%}
---
parameters:
linux:
type: ovs_bridge
mtu: ${_param:interface_mtu}
br-ex:
- enabled: true
- type: ovs_bridge
- mtu: ${_param:interface_mtu}
- address: ${_param:external_address}
- netmask: 255.255.255.0
- proto: static
- gateway: {{ gateway_public }}
- floating-to-ex:
enabled: true
type: ovs_port
- port_type: patch
bridge: br-floating
- peer: ex-to-floating
- ex-to-floating:
- enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-ex
- peer: floating-to-ex
- {{ nic_public }}:
- enabled: true
+ proto: static
{%- if vlan_public and vlan_public != 'native' %}
ovs_options: tag={{ vlan_public }}
{%- endif %}
+ address: ${_param:external_address}
+ netmask: 255.255.255.0
+ {{ nic_public }}:
+ enabled: true
proto: manual
ovs_port_type: OVSPort
type: ovs_port
- ovs_bridge: br-ex
- bridge: br-ex
+ ovs_bridge: br-floating
+ bridge: br-floating
##############################################################################
---
classes:
+ - system.linux.system.repo.glusterfs
- system.ceilometer.client
- system.memcached.server.single
- system.keystone.server.cluster
cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+ glusterfs_version: '3.13'
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:openstack_control_address}
horizon_identity_encryption: none
- horizon_identity_version: 2
+ horizon_identity_version: 3
mongodb_server_replica_set: ceilometer
mongodb_ceilometer_password: opnfv_secret
mongodb_admin_password: opnfv_secret
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
- horizon_identity_version: 2
+ horizon_identity_version: 3
mongodb_server_replica_set: ceilometer
mongodb_ceilometer_password: opnfv_secret
mongodb_admin_password: opnfv_secret
--- /dev/null
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB 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
+##############################################################################
+---
+requirements_pkg:
+ # Common pkgs required for all deploys, no matter the type, arch etc.
+ common:
+ - cloud-guest-utils
+ - cpu-checker
+ - curl
+ - e2fsprogs
+ - git
+ - kpartx
+ - libvirt-bin
+ - make
+ - mkisofs
+ - qemu-kvm
+ - rsync
+ - uuid-runtime
+ - virtinst
+ # Optional, arch-specific requirements, matched by key name = $(uname -m)
+ aarch64:
+ # AArch64 VMs use AAVMF (guest UEFI)
+ - ipxe-qemu
+ - qemu-efi
+ # Optional, deploy-type-specific requirements
+ baremetal:
+ # For baremetal, python is indirectly required for PDF parsing
+ - python
+ - python-ipaddress
+ - python-jinja2
+ - python-yaml
--- /dev/null
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB 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
+##############################################################################
+---
+requirements_pkg:
+ # Common pkgs required for all deploys, no matter the type, arch etc.
+ common:
+ - cloud-utils-growpart
+ - curl
+ - e2fsprogs
+ - genisoimage
+ - git
+ - kpartx
+ - libvirt
+ - make
+ - qemu-kvm
+ - rsync
+ - util-linux
+ - virt-install
+ # Optional, arch-specific requirements, matched by key name = $(uname -m)
+ aarch64:
+ # AArch64 VMs use AAVMF (guest UEFI)
+ - AAVMF
+ # Optional, deploy-type-specific requirements
+ baremetal:
+ # For baremetal, python is indirectly required for PDF parsing
+ - python
+ - python-ipaddress
+ - python-jinja2
+ - python-yaml