From 212f8a6144b38f0ffa0d9eb3c07807699c4e4522 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Thu, 8 Jan 2015 12:54:29 -0500
Subject: [PATCH] Get rid of usage of stackuser element on the undercloud and
 overcloud. Use local-config for the undercloud image in a virt setup instead.
 That will allow ssh'ing as root to the instack vm, and then su'ing to the
 stack user.

---
 elements/instack-vm/element-deps               |  2 +-
 elements/instack-vm/install.d/51-instack-files | 10 +++++++++-
 scripts/instack-build-images                   |  4 ----
 scripts/instack-virt-setup                     |  4 ++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/elements/instack-vm/element-deps b/elements/instack-vm/element-deps
index 185e8c7da..a4372f651 100644
--- a/elements/instack-vm/element-deps
+++ b/elements/instack-vm/element-deps
@@ -1,2 +1,2 @@
-stackuser
 vm
+local-config
diff --git a/elements/instack-vm/install.d/51-instack-files b/elements/instack-vm/install.d/51-instack-files
index 025951ce4..453a974cc 100755
--- a/elements/instack-vm/install.d/51-instack-files
+++ b/elements/instack-vm/install.d/51-instack-files
@@ -5,6 +5,15 @@ set -o pipefail
 
 install-packages net-tools yum-utils git
 
+useradd -m stack
+
+cat > /etc/sudoers.d/stack <<eof
+stack ALL=(ALL) NOPASSWD:ALL
+eof
+
+chmod 0440 /etc/sudoers.d/stack
+visudo -c
+
 mkdir -p /home/stack/.ssh
 cp /tmp/in_target.d/id_rsa_virt_power /home/stack/.ssh/id_rsa_virt_power
 cp /tmp/in_target.d/id_rsa_virt_power.pub /home/stack/.ssh/id_rsa_virt_power.pub
@@ -13,4 +22,3 @@ cp /tmp/in_target.d/instack.answers.sample /home/stack/instack.answers
 cp /tmp/in_target.d/$TE_DATAFILE /home/stack/instackenv.json
 
 chown -R stack:stack /home/stack
-
diff --git a/scripts/instack-build-images b/scripts/instack-build-images
index 1d6f319c4..0ae5512f1 100755
--- a/scripts/instack-build-images
+++ b/scripts/instack-build-images
@@ -82,7 +82,6 @@ pip-cache \
 rabbitmq-server \
 snmpd \
 stable-interface-names \
-stackuser \
 swift-proxy \
 swift-storage \
 use-ephemeral \
@@ -105,7 +104,6 @@ pip-cache \
 pypi-openstack \
 snmpd \
 stable-interface-names \
-stackuser \
 use-ephemeral \
 sysctl \
 "}
@@ -124,7 +122,6 @@ pip-cache \
 pypi-openstack \
 snmpd \
 stable-interface-names \
-stackuser \
 use-ephemeral \
 sysctl \
 "}
@@ -141,7 +138,6 @@ dhcp-all-interfaces \
 hosts \
 ntp \
 snmpd \
-stackuser \
 stable-interface-names \
 use-ephemeral \
 os-refresh-config-reboot \
diff --git a/scripts/instack-virt-setup b/scripts/instack-virt-setup
index 3dbe1f95e..d38a20659 100755
--- a/scripts/instack-virt-setup
+++ b/scripts/instack-virt-setup
@@ -103,6 +103,10 @@ while true; do
     IP=$(cat /var/lib/libvirt/dnsmasq/default.leases | grep $(tripleo get-vm-mac $UNDERCLOUD_VM_NAME) | awk '{print $3;}')
     if [ -n "$IP" ]; then
         echo "$UNDERCLOUD_VM_NAME vm IP address is $IP"
+        echo "You can connect by running:"
+        echo "ssh root@$IP"
+        echo "And then su to the stack user:"
+        echo "su - stack"
         break
     fi
     sleep 3