fuel -

diff options

diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
index 2a2a2ef78..70a2db607 100755
--- a/mcp/config/states/neutron_compute
+++ b/mcp/config/states/neutron_compute

@@ -1,4 +1,4 @@

-#!/bin/bash -x

+#!/bin/bash -e

##############################################################################

@@ -7,6 +7,8 @@

# http://www.apache.org/licenses/LICENSE-2.0

##############################################################################

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

salt -I 'neutron:compute' state.sls neutron

salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \

args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf'

diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index 7b63483d8..34a2c3bd8 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight

@@ -1,4 +1,4 @@

-#!/bin/bash -x

+#!/bin/bash -e

##############################################################################

@@ -7,6 +7,8 @@

# http://www.apache.org/licenses/LICENSE-2.0

##############################################################################

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

salt -I 'opendaylight:server' state.sls opendaylight

salt -I 'opendaylight:client' state.sls opendaylight.client

salt -I 'opendaylight:client' cmd.run 'neutron-odl-ovs-hostconfig --noovs_dpdk'

diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index 968310334..19cd41703 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack

@@ -1,4 +1,4 @@

-#!/bin/bash -x

+#!/bin/bash -e

##############################################################################

@@ -7,6 +7,8 @@

# http://www.apache.org/licenses/LICENSE-2.0

##############################################################################

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

salt -I 'nfs:server' file.mkdir /srv/nova/instances

salt -I 'nfs:server' state.sls nfs

salt -I 'nfs:client' state.sls nfs

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 230288f4f..2e55fc890 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha

@@ -1,4 +1,4 @@

-#!/bin/bash -x

+#!/bin/bash -e

##############################################################################

@@ -7,6 +7,8 @@

# http://www.apache.org/licenses/LICENSE-2.0

##############################################################################

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

# shellcheck disable=SC1090

source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"

@@ -37,7 +39,6 @@ salt -I 'keystone:client' state.sls keystone.client

salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"

salt -I 'glance:server' state.sls glance -b 1

-salt -I 'glusterfs:client' state.sls glusterfs.client

salt -I 'keystone:server' state.sls keystone.server

salt -I 'nova:controller' state.sls nova -b 1

@@ -50,6 +51,7 @@ salt -I 'neutron:server' state.sls neutron -b 1

salt -I 'neutron:gateway' state.sls neutron.gateway

salt -I 'nova:compute' state.sls nova

+salt -I 'glusterfs:client' state.sls glusterfs.client

salt -I 'mongodb:server' state.sls mongodb

wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 58ae33506..a0e3a31d0 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane

@@ -1,4 +1,4 @@

-#!/bin/bash -x

+#!/bin/bash -e

##############################################################################

@@ -7,6 +7,8 @@

# http://www.apache.org/licenses/LICENSE-2.0

##############################################################################

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

# shellcheck disable=SC1090

source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"

@@ -18,7 +20,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected

salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp

-salt -C 'kvm*' state.sls libvirt

+wait_for 5 "salt -C 'kvm*' state.sls libvirt"

salt -C '* and not cfg01* and not mas01*' state.apply salt

salt -C 'kvm*' saltutil.sync_all

diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh
index 6c6d646b3..ca5c14111 100755
--- a/mcp/patches/patch.sh
+++ b/mcp/patches/patch.sh

@@ -1,4 +1,4 @@

-#!/bin/bash -ex

+#!/bin/bash -e

##############################################################################

@@ -7,10 +7,14 @@

# http://www.apache.org/licenses/LICENSE-2.0

##############################################################################

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

if [ -r "$1" ]; then

while IFS=': ' read -r p_dest p_file; do

- if [[ "${p_dest}" =~ $2 ]]; then

- patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"

+ if [[ ! "${p_dest}" =~ '^#' ]] && [[ "${p_dest}" =~ $2 ]] && \

+ ! patch --dry-run -Rd "${p_dest}" -r - -s -p1 < \

+ "/root/fuel/mcp/patches/${p_file}" > /dev/null; then

+ patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"

done < "$1"

diff --git a/mcp/scripts/create-config-drive.sh b/mcp/scripts/create-config-drive.sh
index 51e38c60d..4b22b27ae 100755
--- a/mcp/scripts/create-config-drive.sh
+++ b/mcp/scripts/create-config-drive.sh

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/bash -e

##############################################################################

@@ -12,6 +12,8 @@

# (using the -k/--ssh-key option) and a user-data blog (using the

# -u/--user-data option).

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

usage () {

echo "usage: ${0##*/}: [--ssh-key <pubkey>] [--vendor-data <file>] [--user-data <file>] [--hostname <hostname>] <imagename>"

}

diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
index 6dabe65fe..ce4f9ffe9 100644
--- a/mcp/scripts/globals.sh
+++ b/mcp/scripts/globals.sh

@@ -1,4 +1,4 @@

-#!/bin/bash -ex

+#!/bin/bash -e

##############################################################################

@@ -8,6 +8,7 @@

##############################################################################

# Global variables

+export CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"}

export SALT_MASTER=${INSTALLER_IP:-10.20.0.2}

export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 7449a2172..da129a7da 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/bash -e

##############################################################################

@@ -198,7 +198,8 @@ function wait_for {

# shellcheck disable=SC2034

for attempt in $(seq "${total_attempts}"); do

# shellcheck disable=SC2015

- eval "${cmdstr}" && break || true

+ eval "${cmdstr}" && return 0 || true

echo -n '.'; sleep "${sleep_time}"

done

+ return 1

}

diff --git a/mcp/scripts/log.sh b/mcp/scripts/log.sh
index 8c4bf3ef5..8bfd0d553 100755
--- a/mcp/scripts/log.sh
+++ b/mcp/scripts/log.sh

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/bash -e

##############################################################################

@@ -10,12 +10,14 @@

# Collect /var/log from all cluster nodes via Salt Master

+# shellcheck disable=SC1090

+[ -n "${SSH_OPTS}" ] || source "$(dirname "${BASH_SOURCE[0]}")/globals.sh"

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

DEPLOY_LOG=$1

OPNFV_TMP_LOG="opnfv_fuel_logs"

[ -n "${DEPLOY_LOG}" ] || exit 0

-# shellcheck disable=SC1090

-[ -n "${SSH_OPTS}" ] || source "$(dirname "${BASH_SOURCE[0]}")/globals.sh"

# ssh to cfg01

# shellcheck disable=SC2086,2087

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index df0ef70fb..3bb17f0cd 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/bash -e

##############################################################################

@@ -10,6 +10,7 @@

# Deploy Salt Master

+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x

F_GIT_ROOT=$(git rev-parse --show-toplevel)

OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"

OPNFV_FUEL_DIR="/root/fuel"

@@ -37,14 +38,15 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END

echo ' done'

mkdir -p /srv/salt /usr/share/salt-formulas/reclass

+ rm -rf ${OPNFV_FUEL_DIR}

mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR}

- ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass

- ln -s ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt/scripts

- cd /srv/salt/${OPNFV_RDIR} && ln -s "\$(uname -i)" arch

+ ln -sf ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt

+ ln -sf ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt

+ cd /srv/salt/${OPNFV_RDIR} && rm -f arch && ln -sf "\$(uname -i)" arch

cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass

cd /srv/salt/reclass/classes/service && \

- ln -s /usr/share/salt-formulas/reclass/service/opendaylight

+ ln -sf /usr/share/salt-formulas/reclass/service/opendaylight

cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass

cd /srv/salt/scripts


context:
space:
mode: