commit 5406b6f3cceeb3fd3fa8f9f13aa1eb63371a450b
author Zuul <zuul@review.opendev.org> Tue Aug 20 10:41:05 2019 +0000
committer Gerrit Code Review <review@openstack.org> Tue Aug 20 10:41:05 2019 +0000
tree 430ef127a5aa52751aa3c61269182fe3065d7d7a
parent 3ff4f9ebed14a81a6de8a38926922caf94dc6684
parent 5e2d0e0bb5beffc23087383e7923dabaa2004a98

Merge "Permit use of sudo-ldap instead of sudo package"

stack.sh

diff --git a/stack.sh b/stack.sh
index 3c31644..2544900 100755
--- a/stack.sh
+++ b/stack.sh
@@ -247,7 +247,7 @@
 # --------------
 
 # We're not as **root** so make sure ``sudo`` is available
-is_package_installed sudo || install_package sudo
+is_package_installed sudo || is_package_installed sudo-ldap || install_package sudo
 
 # UEC images ``/etc/sudoers`` does not have a ``#includedir``, add one
 sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||

tools/create-stack-user.sh

diff --git a/tools/create-stack-user.sh b/tools/create-stack-user.sh
index c0b7ac7..919cacb 100755
--- a/tools/create-stack-user.sh
+++ b/tools/create-stack-user.sh
@@ -32,7 +32,7 @@
 source $TOP_DIR/stackrc
 
 # Give the non-root user the ability to run as **root** via ``sudo``
-is_package_installed sudo || install_package sudo
+is_package_installed sudo || is_package_installed sudo-ldap || install_package sudo
 
 [[ -z "$STACK_USER" ]] && die "STACK_USER is not set. Exiting."