@@ -810,13 +810,11 @@ function get_random_port {

 #

 # 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

@@ -962,17 +962,15 @@ fi

 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"