Commit fe5080dd authored by Thomas Goirand's avatar Thomas Goirand

Merge branch 'debian/stein' into debian/rocky

parents 81f827df cca77f0b
......@@ -35,7 +35,7 @@ OBJECT_PORT=0
for i in $(cat ${TMP_HDD_LIST}) ; do
echo "swift-ring-builder account.builder add r${HOST_REGION}z${HOST_ZONE}-${IP}:6002/${i} ${HOST_WEIGHT}"
echo "swift-ring-builder container.builder add r${HOST_REGION}z${HOST_ZONE}-${IP}:6001/${i} ${HOST_WEIGHT}"
OBJECT_CUR_PORT=$((6000 + ${OBJECT_PORT}))
OBJECT_CUR_PORT=$((6200 + ${OBJECT_PORT}))
echo "swift-ring-builder object.builder add r${HOST_REGION}z${HOST_ZONE}-${IP}:${OBJECT_CUR_PORT}/${i} ${HOST_WEIGHT}"
OBJECT_PORT=$((${OBJECT_PORT} + 1))
done
......
#!/bin/sh
set -e
SQL_QUERY=${1}
RESULT_CONTAINS=${2}
DB_NAME=${3}
TIMEOUT=${4}
STARTSTAMP=$(date +%s)
TMPFILE=$(mktemp)
echo "${SQL_QUERY}" >${TMPFILE}
ENLAPSTED=0
while [ "${ENLAPSTED}" -lt "${TIMEOUT}" ] ; do
if /usr/bin/mysql --defaults-extra-file=/root/.my.cnf --database=${DB_NAME} <${TMPFILE} | grep -q ${2} ; then
rm ${TMPFILE}
exit 0
fi
CURTIMESTAMP=$(date +%s)
ENLAPSTED=$((${CURTIMESTAMP} - ${STARTSTAMP}))
sleep 2
done
rm ${TMPFILE}
echo "Timed out..."
exit 1
......@@ -26,7 +26,7 @@ build-openstack-debian-image \
--debootstrap-url ${DEBIAN_MIRROR} \
--sources.list-mirror ${DEBIAN_MIRROR} \
--image-size 10 \
--extra-packages gnupg2 \
--extra-packages gnupg2,joe \
--password ${OCI_VM_ROOT_PASS} \
--no-cloud-init \
${ROOT_SSH_KEY_PARAM} \
......
This diff is collapsed.
This diff is collapsed.
......@@ -1518,8 +1518,12 @@ https://salsa.debian.org/openstack-team/debian/openstack-cluster-installer
}
copy("/usr/bin/oci-auto-join-rabbitmq-cluster", "$template_path/oci-in-target/usr/bin/oci-auto-join-rabbitmq-cluster");
chmod("$template_path/oci-in-target/usr/bin/oci-auto-join-rabbitmq-cluster",0755);
# This is for wait operations to make sure the SQL cluster is up...
copy("/usr/bin/oci-wait-for-sql", "$template_path/oci-in-target/usr/bin/oci-wait-for-sql");
}
##################################################################
### If the machine is a swiftstore, we need the facts.d helper ###
##################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment