From eef85762b0a541242c883ba0de038b98f86bffce Mon Sep 17 00:00:00 2001
From: Rafael Folco <rfolco@redhat.com>
Date: Fri, 10 May 2019 14:43:00 -0300
Subject: [PATCH] Fix --install-deps bindep for quickstart.sh

bindep is not being called on --install-deps argument.
Now it downloads bindep.txt and calls bindep install.

Change-Id: Id8bd74dd5e55db8a9c0bfff4f713506e9e646dd6
Fixes-Bug: #1828509
---
 README.rst      | 7 +++++++
 install-deps.sh | 6 +++---
 quickstart.sh   | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 096a68a7a..54531c5ec 100644
--- a/README.rst
+++ b/README.rst
@@ -37,6 +37,13 @@ password from the machine running ansible.  Currently the virthost machine must
 be running a recent Red Hat-based Linux distribution (CentOS 7.x, RHEL 7.x).
 Other distributions could work but will not be supported with out CI validation.
 
+Quickstart tool runs commands with superuser privileges as installing packages
+to the deployer system. The script should be run by a sudo user, e.g.
+``deployer``, which should be added to the sudoers configuration, as shown
+below::
+
+    deployer ALL=(ALL) NOPASSWD: ALL
+
 ..  note::
     Running quickstart.sh commands as root is not suggested or supported.
 
diff --git a/install-deps.sh b/install-deps.sh
index 1f5a14b2a..9c800a2fd 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -8,9 +8,9 @@
 # python2 and python3 have been validated
 
 print_sudo_warning() {
-    echo -e "\e[31m WARNING: SUDO is not passwordless, assuming all packages \
-are installed! \n export USER_OVERRIDE_SUDO_CHECK=1 \n to be prompted for sudo \
-password \e[0m"
+    echo -e "\e[31m WARNING: SUDO user is not passwordless.\
+\n export USER_OVERRIDE_SUDO_CHECK=1 \n to be prompted for sudo \
+password.  \e[0m"
 }
 
 python_cmd() {
diff --git a/quickstart.sh b/quickstart.sh
index aefdae651..95c786e9e 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -48,6 +48,7 @@ if [[ ! -e ${ABSDIR}/install-deps.sh ]]; then
     echo "install-deps.sh was not found, in the same directory ($ABSDIR) as quickstart.sh"
     echo "downloading install-deps.sh to ${ABSDIR}/install-deps.sh"
     curl -o ${ABSDIR}/install-deps.sh https://opendev.org/openstack/tripleo-quickstart/raw/branch/master/install-deps.sh
+    curl -o ${ABSDIR}/bindep.txt https://opendev.org/openstack/tripleo-quickstart/raw/branch/master/bindep.txt
 fi
 source ${ABSDIR}/install-deps.sh
 
@@ -465,6 +466,8 @@ fi
 if [ "$OPT_INSTALL_DEPS" = 1 ]; then
     echo "NOTICE: installing dependencies" >&2
     install_deps
+    install_bindep
+    install_package_deps_via_bindep
     exit $?
 fi