openstack/devstack
Code Issues Proposed changes

Merge "Put devstack-version info into separate file"

Browse Source
This commit is contained in:
Jenkins
2017-07-11 06:16:29 +00:00
committed by Gerrit Code Review
parent b79531a9f9 07cbc44942
commit e4b2e3b93e
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
functions
View File

@@ -750,19 +750,16 @@ function get_random_port {
echo $port echo $port
} }
# Save some state information
#
# Write out various useful state information to /etc/devstack-version
function write_devstack_version { function write_devstack_version {
pushd $TOP_DIR
local git_version=""
git_version=$(git log --format="%H %ci" -1)
cat - > /tmp/devstack-version <<EOF cat - > /tmp/devstack-version <<EOF
#!/bin/bash DevStack Version: ${DEVSTACK_SERIES}
Change: $(git log --format="%H %s %ci" -1)
echo "DevStack Version: ${DEVSTACK_SERIES} - ${git_version}" OS Version: ${os_VENDOR} ${os_RELEASE} ${os_CODENAME}
echo "OS Version: ${os_VENDOR} ${os_RELEASE} ${os_CODENAME}"
EOF EOF
sudo install -m 755 /tmp/devstack-version /usr/local/bin/devstack-version sudo install -m 644 /tmp/devstack-version /etc/devstack-version
rm /tmp/devstack-version rm /tmp/devstack-version
} }

6
stack.sh
View File

@@ -216,7 +216,7 @@ if [[ ! -r $TOP_DIR/stackrc ]]; then
fi fi
source $TOP_DIR/stackrc source $TOP_DIR/stackrc
# this installs a devstack-version script to make it easy to report the version back # write /etc/devstack-version
write_devstack_version write_devstack_version
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
@@ -1538,8 +1538,8 @@ if [[ "$USE_SYSTEMD" == "True" ]]; then
echo echo
fi fi
# devstack version # Useful info on current state
devstack-version cat /etc/devstack-version
echo echo
# Indicate how long this took to run (bash maintained variable ``SECONDS``) # Indicate how long this took to run (bash maintained variable ``SECONDS``)