diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-06-10 00:50:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-10 00:50:02 +0000 |
| commit | f30199f018ae167df804c23079eb4bcec6c10f34 (patch) | |
| tree | 9fea7afccdc9dfb32cf17486f51e8da1fd7b7b02 /kud/hosting_providers | |
| parent | 047872661b83422149ccf4b46defb5f90f3e7c54 (diff) | |
| parent | 540c5b56469b52fdaccee624f582ce1c3e06efe9 (diff) | |
Merge changes I798b9dd9,I36b65dd2
* changes:
Remove the requirement to run aio.sh as root
Documentation update for aio.sh CI change
Diffstat (limited to 'kud/hosting_providers')
| -rwxr-xr-x | kud/hosting_providers/baremetal/aio.sh | 7 | ||||
| -rwxr-xr-x | kud/hosting_providers/vagrant/installer.sh | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/kud/hosting_providers/baremetal/aio.sh b/kud/hosting_providers/baremetal/aio.sh index 5b448183..416a1fef 100755 --- a/kud/hosting_providers/baremetal/aio.sh +++ b/kud/hosting_providers/baremetal/aio.sh @@ -12,11 +12,6 @@ set -o errexit set -o nounset set -o pipefail -if [[ $(whoami) != 'root' ]];then - echo "This bash script must be executed as root user" - exit 1 -fi - aio_dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) cd ${aio_dir}/../vagrant @@ -53,7 +48,7 @@ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys chmod og-wx ~/.ssh/authorized_keys echo "Enabling nested-virtualization" -./node.sh +sudo ./node.sh echo "Deploying KUD project" ./installer.sh | tee kud_installer.log diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index 346e2f69..c7715b59 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -196,6 +196,7 @@ function _print_kubernetes_info { echo "Admin password: secret" >> $k8s_info_file } +sudo -k # forgot sudo password if ! sudo -n "true"; then echo "" echo "passwordless sudo is needed for '$(id -nu)' user." |