openstack/devstack
Code Issues Proposed changes

Merge "Remove references to hardcoded file writing in /tmp"

Browse Source
This commit is contained in:
Zuul 2018-03-06 03:58:18 +00:00 committed by Gerrit Code Review
commit 07fc8ef826
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions
View File

@ -810,13 +810,11 @@ function get_random_port {
# #
# Write out various useful state information to /etc/devstack-version # Write out various useful state information to /etc/devstack-version
function write_devstack_version { function write_devstack_version {
cat - > /tmp/devstack-version <<EOF cat - <<EOF | sudo tee /etc/devstack-version >/dev/null
DevStack Version: ${DEVSTACK_SERIES} DevStack Version: ${DEVSTACK_SERIES}
Change: $(git log --format="%H %s %ci" -1) Change: $(git log --format="%H %s %ci" -1)
OS Version: ${os_VENDOR} ${os_RELEASE} ${os_CODENAME} OS Version: ${os_VENDOR} ${os_RELEASE} ${os_CODENAME}
EOF EOF
sudo install -m 644 /tmp/devstack-version /etc/devstack-version
rm /tmp/devstack-version
} }
# Restore xtrace # Restore xtrace

6
stack.sh
View File

@ -962,17 +962,15 @@ fi
if [[ $SYSLOG != "False" ]]; then if [[ $SYSLOG != "False" ]]; then
if [[ "$SYSLOG_HOST" = "$HOST_IP" ]]; then if [[ "$SYSLOG_HOST" = "$HOST_IP" ]]; then
# Configure the master host to receive # Configure the master host to receive
cat <<EOF >/tmp/90-stack-m.conf cat <<EOF | sudo tee /etc/rsyslog.d/90-stack-m.conf >/dev/null
\$ModLoad imrelp \$ModLoad imrelp
\$InputRELPServerRun $SYSLOG_PORT \$InputRELPServerRun $SYSLOG_PORT
EOF EOF
sudo mv /tmp/90-stack-m.conf /etc/rsyslog.d
else else
# Set rsyslog to send to remote host # Set rsyslog to send to remote host
cat <<EOF >/tmp/90-stack-s.conf cat <<EOF | sudo tee /etc/rsyslog.d/90-stack-s.conf >/dev/null
*.* :omrelp:$SYSLOG_HOST:$SYSLOG_PORT *.* :omrelp:$SYSLOG_HOST:$SYSLOG_PORT
EOF EOF
sudo mv /tmp/90-stack-s.conf /etc/rsyslog.d
fi fi
RSYSLOGCONF="/etc/rsyslog.conf" RSYSLOGCONF="/etc/rsyslog.conf"