Merge branch 'stable/juno'

Conflicts:
	json-files/rhel-7-rhos-6-undercloud-packages.json
	scripts/instack-install-undercloud
	scripts/instack-prepare-for-overcloud

elements/instack-vm/element-deps

@@ -1,2 +1,2 @@
-stackuser
 vm
+local-config

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
-

elements/pip-and-virtualenv-override/README.md

@@ -0,0 +1,4 @@
+This element will override the behavior from the pip-and-virtualenv element
+from tripleo-image-elements so that python-pip and python-virtualenv are never
+installed.
+

elements/pip-and-virtualenv-override/element-provides

@@ -0,0 +1 @@
+pip-and-virtualenv

elements/undercloud-install/pre-install.d/01-pbr

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-install-packages python-pbr

json-files/rhel-7-rhos-6-undercloud-packages.json

@@ -54,7 +54,8 @@
     ],
     "exclude-element": [
       "dkms",
-      "openvswitch-datapath"
+      "openvswitch-datapath",
+      "pip-and-virtualenv"
     ],
     "blacklist": [
       "10-cloud-init",

scripts/instack-build-images

@@ -58,7 +58,7 @@ fi
 
 export PACKAGES=${PACKAGES:-"1"}
 if [ "$PACKAGES" = "1" ]; then
-    export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install"
+    export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install pip-and-virtualenv-override"
 fi
 
 export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\
@@ -86,7 +86,6 @@ pip-cache \
 rabbitmq-server \
 snmpd \
 stable-interface-names \
-stackuser \
 swift-proxy \
 swift-storage \
 use-ephemeral \
@@ -109,7 +108,6 @@ pip-cache \
 pypi-openstack \
 snmpd \
 stable-interface-names \
-stackuser \
 use-ephemeral \
 sysctl \
 "}
@@ -128,7 +126,6 @@ pip-cache \
 pypi-openstack \
 snmpd \
 stable-interface-names \
-stackuser \
 use-ephemeral \
 sysctl \
 "}
@@ -145,7 +142,6 @@ dhcp-all-interfaces \
 hosts \
 ntp \
 snmpd \
-stackuser \
 stable-interface-names \
 use-ephemeral \
 os-refresh-config-reboot \

scripts/instack-virt-setup

@@ -76,6 +76,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