From daf33b135d802e137ee1d0ed8abcc313d4b4f22c Mon Sep 17 00:00:00 2001 From: Kristine Bujold Date: Fri, 2 Aug 2019 13:37:53 -0400 Subject: [PATCH] Collapse the glance filesystem into platform The filesystem /opt/cgcs is removed and its content moved under /opt/platform. Resources related to drbd-cgcs and /opt/cgcs are updated to drbd-plaform and /opt/plaform. Tested in AIO-SX, AIO-DX and Standard hardware labs. Depends-On: https://review.opendev.org/674360 Partial-Bug: 1830142 Change-Id: I6d0555f00ab269f7d9567fff365180b66adce8b3 Signed-off-by: Kristine Bujold --- centos_iso_image.inc | 1 - .../centos/build_srpm.data | 2 +- monitoring/collectd-extensions/src/df.conf | 1 - tools/collector/centos/build_srpm.data | 2 +- tools/collector/scripts/collect_openstack.sh | 44 ++- tools/engtools/parsers/host.conf | 16 +- .../tis-extensions/centos/build_srpm.data | 2 +- .../tis-extensions/centos/tis-extensions.spec | 9 - utilities/tis-extensions/files/target | 290 ------------------ utilities/tis-extensions/files/target.service | 14 - 10 files changed, 30 insertions(+), 351 deletions(-) delete mode 100644 utilities/tis-extensions/files/target delete mode 100644 utilities/tis-extensions/files/target.service diff --git a/centos_iso_image.inc b/centos_iso_image.inc index a01ca678e..df32e5398 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -69,7 +69,6 @@ swtpm-tools # tis-extensions tis-extensions -tis-extensions-controller # python-3parclient python-3parclient diff --git a/monitoring/collectd-extensions/centos/build_srpm.data b/monitoring/collectd-extensions/centos/build_srpm.data index f268418d7..d4ac143ba 100644 --- a/monitoring/collectd-extensions/centos/build_srpm.data +++ b/monitoring/collectd-extensions/centos/build_srpm.data @@ -22,4 +22,4 @@ COPY_LIST="$PKG_BASE/src/LICENSE \ $PKG_BASE/src/ptp.conf \ $PKG_BASE/src/example.py \ $PKG_BASE/src/example.conf" -TIS_PATCH_VER=12 +TIS_PATCH_VER=13 diff --git a/monitoring/collectd-extensions/src/df.conf b/monitoring/collectd-extensions/src/df.conf index 147619b8b..62eef59dd 100644 --- a/monitoring/collectd-extensions/src/df.conf +++ b/monitoring/collectd-extensions/src/df.conf @@ -14,7 +14,6 @@ MountPoint "/boot" MountPoint "/scratch" MountPoint "/opt/etcd" - MountPoint "/opt/cgcs" MountPoint "/opt/platform" MountPoint "/opt/extension" MountPoint "/var/lib/rabbitmq" diff --git a/tools/collector/centos/build_srpm.data b/tools/collector/centos/build_srpm.data index 9add1c8b9..a9d3f505b 100644 --- a/tools/collector/centos/build_srpm.data +++ b/tools/collector/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="scripts" -TIS_PATCH_VER=28 +TIS_PATCH_VER=29 diff --git a/tools/collector/scripts/collect_openstack.sh b/tools/collector/scripts/collect_openstack.sh index 42d7d24d8..e03eca852 100755 --- a/tools/collector/scripts/collect_openstack.sh +++ b/tools/collector/scripts/collect_openstack.sh @@ -1,6 +1,6 @@ #! /bin/bash # -# Copyright (c) 2013-2014 Wind River Systems, Inc. +# Copyright (c) 2013-2019 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -33,35 +33,29 @@ if [ "$nodetype" = "controller" ] ; then exit 0 fi -delimiter ${LOGFILE} "openstack project list" -openstack project list >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} + delimiter ${LOGFILE} "openstack project list" + openstack project list >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} -delimiter ${LOGFILE} "openstack user list" -openstack user list >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} + delimiter ${LOGFILE} "openstack user list" + openstack user list >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} -MQ_STATUS="rabbitmqctl status" -delimiter ${LOGFILE} "${MQ_STATUS} | grep -e '{memory' -A30" -${MQ_STATUS} 2>/dev/null | grep -e '{memory' -A30 >> ${LOGFILE} + MQ_STATUS="rabbitmqctl status" + delimiter ${LOGFILE} "${MQ_STATUS} | grep -e '{memory' -A30" + ${MQ_STATUS} 2>/dev/null | grep -e '{memory' -A30 >> ${LOGFILE} -delimiter ${LOGFILE} "RabbitMQ Queue Info" -num_queues=$(rabbitmqctl list_queues | wc -l); ((num_queues-=2)) -num_bindings=$(rabbitmqctl list_bindings | wc -l); ((num_bindings-=2)) -num_exchanges=$(rabbitmqctl list_exchanges | wc -l); ((num_exchanges-=2)) -num_connections=$(rabbitmqctl list_connections | wc -l); ((num_connections-=2)) -num_channels=$(rabbitmqctl list_channels | wc -l); ((num_channels-=2)) -arr=($(rabbitmqctl list_queues messages consumers memory | \ - awk '/^[0-9]/ {a+=$1; b+=$2; c+=$3} END {print a, b, c}')) -messages=${arr[0]}; consumers=${arr[1]}; memory=${arr[2]} -printf "%6s %8s %9s %11s %8s %8s %9s %10s\n" "queues" "bindings" "exchanges" "connections" "channels" "messages" "consumers" "memory" >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} -printf "%6d %8d %9d %11d %8d %8d %9d %10d\n" $num_queues $num_bindings $num_exchanges $num_connections $num_channels $messages $consumers $memory >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} - - if [ -e /opt/cgcs/ceilometer/pipeline.yaml ] ; then - cp /opt/cgcs/ceilometer/pipeline.yaml ${extradir}/ceilometer_pipeline.yaml - fi + delimiter ${LOGFILE} "RabbitMQ Queue Info" + num_queues=$(rabbitmqctl list_queues | wc -l); ((num_queues-=2)) + num_bindings=$(rabbitmqctl list_bindings | wc -l); ((num_bindings-=2)) + num_exchanges=$(rabbitmqctl list_exchanges | wc -l); ((num_exchanges-=2)) + num_connections=$(rabbitmqctl list_connections | wc -l); ((num_connections-=2)) + num_channels=$(rabbitmqctl list_channels | wc -l); ((num_channels-=2)) + arr=($(rabbitmqctl list_queues messages consumers memory | \ + awk '/^[0-9]/ {a+=$1; b+=$2; c+=$3} END {print a, b, c}')) + messages=${arr[0]}; consumers=${arr[1]}; memory=${arr[2]} + printf "%6s %8s %9s %11s %8s %8s %9s %10s\n" "queues" "bindings" "exchanges" "connections" "channels" "messages" "consumers" "memory" >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} + printf "%6d %8d %9d %11d %8d %8d %9d %10d\n" $num_queues $num_bindings $num_exchanges $num_connections $num_channels $messages $consumers $memory >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG} fi - - ############################################################################### # collect does not retrieve /etc/keystone dir # Additional logic included to copy /etc/keystone directory diff --git a/tools/engtools/parsers/host.conf b/tools/engtools/parsers/host.conf index 4d01410ce..8da6ce62d 100644 --- a/tools/engtools/parsers/host.conf +++ b/tools/engtools/parsers/host.conf @@ -58,8 +58,8 @@ SERVICE_LIST="aodh-api aodh-listener aodh-notifier aodh-evaluator barbican-api b # NETSTATS_INTERFACE_LIST config parameter is used to generate netstats csv # # Sample configuration below is for one of the lab controllers -# Either cat the /proc/net/dev file or inspect one of the collected netstats bz2 files -# (e.g. bzcat controller-0_2016-11-23_0546_netstats.bz2 | less -S -#10) to see the list of +# Either cat the /proc/net/dev file or inspect one of the collected netstats bz2 files +# (e.g. bzcat controller-0_2016-11-23_0546_netstats.bz2 | less -S -#10) to see the list of # interfaces configured for the host. Those interfaces with all 0 values can be skipped. ############################################################################################ NETSTATS_INTERFACE_LIST="eno1 bond0 ens801f0 ens801f1 bond0.109" @@ -69,21 +69,21 @@ NETSTATS_INTERFACE_LIST="eno1 bond0 ens801f0 ens801f1 bond0.109" # # Sample configuration below is for one of the lab controllers # -# Inspect one of the collected iostat.bz2 files -# (e.g. bzcat controller-0_2016-11-23_0955_iostat.bz2 | less -S -#10) to see the list of +# Inspect one of the collected iostat.bz2 files +# (e.g. bzcat controller-0_2016-11-23_0955_iostat.bz2 | less -S -#10) to see the list of # devices configured for the host. ############################################################################################ -IOSTATS_DEVICE_LIST="sda sdb dm-0 dm-1 dm-2 dm-3 dm-4 dm-5 dm-6 dm-7 dm-8 drbd0 drbd1 drbd2 drbd3" +IOSTATS_DEVICE_LIST="sda sdb dm-0 dm-1 dm-2 dm-3 dm-4 dm-5 dm-6 dm-7 dm-8 drbd0 drbd1 drbd2" ############################################################################################ # DISKSTATS_FILESYSTEM_LIST config parameter is used to generate diskstats csv # Use "df -l" command to see the list of partitions # # Sample configuration below is for one of the lab controllers. The format for each fs item -# is |. +# is |. # -# Either use "df -l" command to see the filesystem list or inspect one of the collected +# Either use "df -l" command to see the filesystem list or inspect one of the collected # diskstats.bz2 files (e.g. bzcat controller-0_2016-11-23_1057_diskstats.bz2 | less -S -#10) # to see the list of filesystems configured for the host. ############################################################################################ -DISKSTATS_FILESYSTEM_LIST="/dev/sda3|/ /dev/mapper/cgts--vg-scratch--lv|/scratch /dev/mapper/cgts--vg-log--lv|/var/log /dev/mapper/cgts--vg-backup--lv|/opt/backups /dev/mapper/cgts--vg-ceph--mon--lv|/var/lib/ceph/mon /dev/mapper/cgts--vg-img--conversions--lv|/opt/img-conversions /dev/drbd2|/opt/platform /dev/drbd0|/var/lib/postgresql /dev/drbd3|/opt/cgcs /dev/drbd1|/var/lib/rabbitmq" +DISKSTATS_FILESYSTEM_LIST="/dev/sda3|/ /dev/mapper/cgts--vg-scratch--lv|/scratch /dev/mapper/cgts--vg-log--lv|/var/log /dev/mapper/cgts--vg-backup--lv|/opt/backups /dev/mapper/cgts--vg-ceph--mon--lv|/var/lib/ceph/mon /dev/drbd2|/opt/platform /dev/drbd0|/var/lib/postgresql /dev/drbd1|/var/lib/rabbitmq" diff --git a/utilities/tis-extensions/centos/build_srpm.data b/utilities/tis-extensions/centos/build_srpm.data index 75f295c2e..619d51041 100644 --- a/utilities/tis-extensions/centos/build_srpm.data +++ b/utilities/tis-extensions/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=2 +TIS_PATCH_VER=3 diff --git a/utilities/tis-extensions/centos/tis-extensions.spec b/utilities/tis-extensions/centos/tis-extensions.spec index 179b77244..5b332b8ff 100644 --- a/utilities/tis-extensions/centos/tis-extensions.spec +++ b/utilities/tis-extensions/centos/tis-extensions.spec @@ -41,11 +41,6 @@ TIS Extensions to thirdparty pkgs on controller %build %install -install -d -m 755 %{buildroot}%{local_etc_initd} -install -p -D -m 555 target %{buildroot}%{local_etc_initd}/target - -install -d -m 755 %{buildroot}%{local_etc_systemd} -install -p -D -m 444 target.service %{buildroot}%{local_etc_systemd}/target.service install -d -m 755 %{buildroot}%{local_etc_sysctl} install -p -D -m 644 coredump-sysctl.conf %{buildroot}%{local_etc_sysctl}/50-coredump.conf @@ -63,7 +58,3 @@ install -p -D -m 644 modules-load-vfio.conf %{buildroot}%{local_etc_modload}/vfi %{local_etc_modload}/vfio.conf %doc LICENSE -%files -n %{name}-controller -%defattr(-,root,root,-) -%{local_etc_initd}/target -%{local_etc_systemd}/target.service diff --git a/utilities/tis-extensions/files/target b/utilities/tis-extensions/files/target deleted file mode 100644 index 259fa012b..000000000 --- a/utilities/tis-extensions/files/target +++ /dev/null @@ -1,290 +0,0 @@ -#!/bin/bash -# -# Filename: /etc/init.d/target -# -# Bring up/down iscsi LIO target -# -######################################################################### -# - -# -# Copyright (c) 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -DESC="target" -STATUS_FILE="/var/run/lio-target.running" - -CINDER_CONF_DIR="/opt/cgcs/cinder" -LIO_CONF_DIR="${CINDER_CONF_DIR}/iscsi-target" -LIO_CONF_FILE="${LIO_CONF_DIR}/saveconfig.json" -TGT_CONF_FILE="${CINDER_CONF_DIR}/data/tgt-initiators-15.12-upgrade.conf" -BASE_TARGET_DIR="/etc/target" - -# Tools -TARGETCLI="/usr/bin/targetcli" -RTSTOOL="/usr/bin/cinder-rtstool" -SM_QUERY="/usr/bin/sm-query" - -# This will log to /var/log/platform.log - -NAME=$(basename $0) - -function log () { - logger -p local1.info "${NAME}: $1" -} - -# Determine whether we are running on the active controller. -# Return value: 0 - controller is active, 1 - not active. - -is_active_controller () { - - # service drbd-cgcs - should be active before iscsi one - local SERVICE="drbd-cgcs" - local ACTIVE=$(${SM_QUERY} service ${SERVICE} | \ - grep enabled-active) - - if [ -z "${ACTIVE}" ] ; then - return 1 - else - return 0 - fi -} - - -# This is a function that migrates 15.12 TGT Target configuration -# to the LIO Target configuration file. The function is called only -# once on the first "swact" to the LIO controller after -# Software Upgrade. - -migrate_tgt () { - - log "Migrating 15.12 TGT iSCSI Target to LIO" - - # TGT configuration directory - TGT_CONF_DIR="/opt/cgcs/cinder/data/volumes" - - # Start the LIO target and enable it for configuration - /usr/bin/targetctl restore - - if [ $? -ne 0 ] ; then - log "ERROR: trying to start the LIO target" - return 1 - fi - - if [ ! -d ${TGT_CONF_DIR} ] ; then - # User does not have attached volumes - log "No volumes to migrate. Migration is done" - return 0 - fi - - if [ ! "$(ls -A ${TGT_CONF_DIR})" ] ; then - # Cinder volumes configuration is empty - log "No volumes to migrate. Migration is done" - return 0 - fi - - PORTAL_IP="" - - if [ -e /etc/hosts ] ; then - PORTAL_IP=$(grep controller-cinder /etc/hosts | awk '{print $1}') - fi - - # If no Portal IP is specified, use default IP address - if [ -z "${PORTAL_IP}" ] ; then - PORTAL_IP="0.0.0.0" - fi - - for volume in `find ${TGT_CONF_DIR} -name "volume-*"` - do - TARGET_NAME=$(grep -n target ${volume} | awk '{ print $2}' | \ - sed 's/>//') - DEVICE=$(grep -n backing-store ${volume} | awk '{print $3}') - - USERID=$(grep -n incominguser ${volume} | awk '{print $3}') - - PASSWORD=$(grep -n incominguser ${volume} | awk '{print $4}') - - INITIATOR=$(grep -n ${TARGET_NAME} ${TGT_CONF_FILE} | \ - awk '{ print $5 }') - - if [ ! "${TARGET_NAME}" -a "${DEVICE}" -a "${USERID}" -a \ - "${PASSWORD}" -a "${INITIATOR}" ] ; then - log "ERROR: volume ${TARGET_NAME} configuration is not complete" - continue - fi - # Add the volume to the LIO configuration - ${RTSTOOL} create ${DEVICE} ${TARGET_NAME} ${USERID} ${PASSWORD} \ - False -a${PORTAL_IP} -p3260 2>/dev/null - - if [ $? -ne 0 ] ; then - log "ERROR: Target creation failed for volume ${TARGET_NAME}" - continue - fi - - log "Created target ${TARGET_NAME}" - - ${RTSTOOL} add-initiator ${TARGET_NAME} ${USERID} ${PASSWORD} \ - ${INITIATOR} 2>/dev/null - - if [ $? -ne 0 ] ; then - log "ERROR: Add Initiator ${INITIATOR} failed for ${TARGET_NAME}" - continue - fi - log "Added Initiator ${INITIATOR} for ${TARGET_NAME}" - - # Create a lun mapping from 1 to 0. Why? Well 15.12 used tgt which - # uses lun 1 as the first volume, but lio uses lun 0. This mapping - # allows iscsi references created in the old tgt realm to continue - # to work. - ${TARGETCLI} "/iscsi/${TARGET_NAME}/tpg1/acls/${INITIATOR} create 1 0" - if [ $? -ne 0 ] ; then - log "ERROR: lun 1 mapping failed: Initiator ${INITIATOR} Target ${TARGET_NAME}" - else - log "Added lun 1 mapping: Initiator ${INITIATOR} Target ${TARGET_NAME}" - fi - done - - # Save and verify the new LIO configuration - ${RTSTOOL} save 2> /dev/null - - if [ $? -ne 0 ] ; then - log "ERROR: Cannot save LIO Target configuration" - return 1 - fi - - ${RTSTOOL} verify 2> /dev/null - - if [ $? -ne 0 ] ; then - log "ERROR: LIO Target verification failed" - return 1 - fi - - log "TGT to LIO migration is done" - return 0 -} - -start () { - - echo -n "Starting ${DESC}..." - - if ! is_active_controller ; then - echo "failed. Controller is not active." - exit 1 - fi - - if [ ! -L ${BASE_TARGET_DIR} ] ; then - rm -rf ${BASE_TARGET_DIR} - ln -s ${LIO_CONF_DIR} ${BASE_TARGET_DIR} - fi - - if [ ! -d ${LIO_CONF_DIR} ] ; then - # Create LIO configuration directory - mkdir -p ${LIO_CONF_DIR} && log "Created ${LIO_CONF_DIR}" - - # Create default LIO configuration file - ${TARGETCLI} saveconfig ${LIO_CONF_FILE} - fi - - if [ -e ${TGT_CONF_FILE} -a -s ${TGT_CONF_FILE} ] ; then - migrate_tgt - - if [ $? -ne 0 ] ; then - echo "tgt migration failed." - exit 1 - fi - mv -f ${TGT_CONF_FILE} ${TGT_CONF_FILE}.bak - else - - /usr/bin/targetctl restore - - if [ $? -ne 0 ] ; then - echo "failed." - exit 1 - fi - fi - - touch ${STATUS_FILE} - - echo "done." -} - -stop () { - - echo -n "Stopping ${DESC}..." - - if [ ! -f ${STATUS_FILE} ] ; then - echo "service has not been started" - exit 0 - fi - - /usr/bin/targetctl clear - - RET=$? - - if [ -f ${STATUS_FILE} ] ; then - rm -f ${STATUS_FILE} - fi - - if [ ${RET} -ne 0 ] ; then - echo "failed." - exit 1 - fi - - echo -n -} - -status() -{ - if [ ! -f ${STATUS_FILE} ] ; then - echo "${DESC} has not been started" - exit 3 - else - echo "${DESC} had been started" - fi -} - -restart () { - stop - start -} - -reload() -{ - if [ ! -f ${STATUS_FILE} ] ; then - echo "${DESC} has not been started" - exit 1 - fi - - /usr/bin/targetctl restore - - if [ $? -ne 0 ] ; then - echo "failed." - exit 1 - fi -} - -case "$1" in - start) - start - ;; - status) - status - ;; - stop|forcedstop) - stop - ;; - reload|force-reload) - reload - ;; - restart|try-restart) - restart - ;; - *) - echo $"Usage: $0 {start|status|stop|forcedstop|restart|try-restart|reload|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/utilities/tis-extensions/files/target.service b/utilities/tis-extensions/files/target.service deleted file mode 100644 index 7311e0c2e..000000000 --- a/utilities/tis-extensions/files/target.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=iscsi LIO target service -After=config.service - -[Service] -Type=oneshot -ExecStart=/etc/init.d/target -ExecStop= -ExecReload= -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target -