From d2e5725fea6996523bf877f015d0f29b3acb8e9b Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Mon, 30 Jul 2018 14:35:43 +0300 Subject: [PATCH] Remove tripleo.sh --bootstrap-subnodes from toci_gate_test.sh In https://review.openstack.org/583195 we are removing the bootstrap subnodes invocations for the zuul v3 jobs and the templated version of toci_gate_test.sh.j2. Here we do the same for the legacy bash version of toci_gate_test.sh and add a deprecation note on the tripleo.sh --bootstrap-subnodes function itself. The invocation of tripleo.sh is removed with the now unused functions echo_vars_to_deploy_env_oooq subnodes_scp_deploy_env Instead the creation of ceph /dev/loop3 is handled in the base job pre.yaml added in the Depends-On below Depends-On: https://review.rdoproject.org/r/15000 Depends-On: Ib95b02767488aaddfe95633d03cb118dd492a700 Change-Id: I039388e4c3d4959270c45e827e76993636bd2990 --- scripts/common_functions.sh | 43 ------------------------- scripts/tripleo.sh | 4 +-- toci-quickstart/config/collect-logs.yml | 1 - toci_gate_test.sh | 20 ------------ 4 files changed, 2 insertions(+), 66 deletions(-) diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh index 5b0f7465f..457254a56 100755 --- a/scripts/common_functions.sh +++ b/scripts/common_functions.sh @@ -372,49 +372,6 @@ function echo_vars_to_deploy_env { done } -# Same function as above, but for oooq jobs (less variables defined) -function echo_vars_to_deploy_env_oooq { - CALLER=$(caller) - echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env - for VAR in NODEPOOL_CENTOS_MIRROR http_proxy MY_IP no_proxy NODECOUNT SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TOCI_JOBTYPE JOB_NAME SUBNODES_SSH_KEY FEATURE_BRANCH BOOTSTRAP_SUBNODES_MINIMAL; do - if [ -n "${!VAR:+x}" ]; then - echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env - fi - done - # TODO(gcerami) uncomment this code if 3nodes jobs are implemented before the bootstrap role - # in quickstart. If the bootstrap role is implemented first, this function can be completely - # removed - #for role in $OVERCLOUD_ROLES; do - # eval hosts=\${${role}_hosts} - # echo "export ${role}_hosts=\"${hosts}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env - #done -} - -# Enclose IPv6 addresses in brackets. -# This is needed for scp command where the first column of IPv6 address gets -# interpreted as the separator between address and path otherwise. -# $1 : IP address to sanitize -function sanitize_ip_address { - ip=$1 - if [[ $ip =~ .*:.* ]]; then - echo \[$ip\] - else - echo $ip - fi -} - -function subnodes_scp_deploy_env { - for ip in $(cat /etc/nodepool/sub_nodes_private); do - sanitized_address=$(sanitize_ip_address $ip) - ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \ - sudo mkdir -p $TRIPLEO_ROOT/tripleo-ci - scp $SSH_OPTIONS -i /etc/nodepool/id_rsa \ - $TRIPLEO_ROOT/tripleo-ci/deploy.env ${sanitized_address}: - ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \ - sudo cp deploy.env $TRIPLEO_ROOT/tripleo-ci/deploy.env - done -} - function stop_dstat { ps axjf | grep bin/dstat | grep -v grep | awk '{print $2;}' | sudo xargs -t -n 1 -r kill } diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh index 6bc53f8f3..bd95e6934 100755 --- a/scripts/tripleo.sh +++ b/scripts/tripleo.sh @@ -54,7 +54,7 @@ function show_options { echo " --delorean-setup -- Install local delorean build environment." echo " --delorean-build -- Build a delorean package locally" echo " --multinode-setup -- Perform multinode setup." - echo " --bootstrap-subnodes -- Perform bootstrap setup on subnodes." + echo " --bootstrap-subnodes -- Perform bootstrap setup on subnodes. WARNING bootstrap-subnodes is deprecated and will be removed." echo " --setup-nodepool-files -- Setup nodepool files on subnodes." echo " --undercloud -- Install the undercloud." echo " --overcloud-images -- Build and load overcloud images." @@ -1459,7 +1459,7 @@ function undercloud_sanity_check { } function bootstrap_subnodes { - log "Bootstrap subnodes" + log "WARNING: Bootstrap subnodes is deprecated and will be removed. " local sub_nodes sub_nodes=$(cat /etc/nodepool/sub_nodes_private) diff --git a/toci-quickstart/config/collect-logs.yml b/toci-quickstart/config/collect-logs.yml index efb83930b..68646cf71 100644 --- a/toci-quickstart/config/collect-logs.yml +++ b/toci-quickstart/config/collect-logs.yml @@ -188,7 +188,6 @@ artcl_collect_list: - /var/log/journal.txt - /var/log/postci.txt - /var/log/secure - - /var/log/bootstrap-subnodes.log - /var/log/unbound.log - /var/log/yum.log - /var/log/aodh/ diff --git a/toci_gate_test.sh b/toci_gate_test.sh index 2c01c5e05..9a82cb5eb 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -284,26 +284,6 @@ else undercloud_haproxy_admin_ip=$undercloud_net_range"3" export no_proxy=$undercloud_services_ip,$undercloud_haproxy_public_ip,$undercloud_haproxy_admin_ip,$MY_IP,$MY_IP_eth1 - - - # multinode bootstrap script - export DO_BOOTSTRAP_SUBNODES=${DO_BOOTSTRAP_SUBNODES:-1} - export BOOTSTRAP_SUBNODES_MINIMAL=1 - overcloud_release=${UPGRADE_RELEASE:-$STABLE_RELEASE} - if [ "${overcloud_release}" = "newton" ]; then - BOOTSTRAP_SUBNODES_MINIMAL=0 - fi - - echo_vars_to_deploy_env_oooq - subnodes_scp_deploy_env - if [ "$DO_BOOTSTRAP_SUBNODES" = "1" ]; then - $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh \ - --bootstrap-subnodes \ - 2>&1 | awk '{ print strftime("%Y-%m-%d %H:%M:%S |"), $0; fflush(); }' | sudo tee /var/log/bootstrap-subnodes.log \ - || (tail -n 50 /var/log/bootstrap-subnodes.log && false) - fi - - # finally, run quickstart ./toci_quickstart.sh fi