commit 07fc8ef82656bbbacf16247760e0176fef8f975a
author Zuul <zuul@review.openstack.org> Tue Mar 06 03:58:18 2018 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 06 03:58:18 2018 +0000
tree e4e30b76ec33e3e5a0cfe9a951f89b7b435a35ce
parent 8efc710937274c52fe055de9ec051360706234d7
parent 6bab8321b44db260f9e001d8276a660d1ff56ed4

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

functions

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

stack.sh

diff --git a/stack.sh b/stack.sh
index 1803169..554591d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -962,17 +962,15 @@
 if [[ $SYSLOG != "False" ]]; then
     if [[ "$SYSLOG_HOST" = "$HOST_IP" ]]; then
         # 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
 \$InputRELPServerRun $SYSLOG_PORT
 EOF
-        sudo mv /tmp/90-stack-m.conf /etc/rsyslog.d
     else
         # 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
 EOF
-        sudo mv /tmp/90-stack-s.conf /etc/rsyslog.d
     fi
 
     RSYSLOGCONF="/etc/rsyslog.conf"