diff options
| -rw-r--r-- | components/congress/install/bash/clean_congress.sh | 1 | ||||
| -rw-r--r-- | components/congress/install/bash/install_congress_1.sh | 9 | ||||
| -rw-r--r-- | components/congress/install/bash/install_congress_2.sh | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/components/congress/install/bash/clean_congress.sh b/components/congress/install/bash/clean_congress.sh index a322dbe..19f3341 100644 --- a/components/congress/install/bash/clean_congress.sh +++ b/components/congress/install/bash/clean_congress.sh @@ -25,6 +25,7 @@ # - Retrieve the copper remova script as below # $ cd ~ # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/clean_congress.sh +# $ bash clean_congress.sh echo "OS-specific prerequisite steps" dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'` diff --git a/components/congress/install/bash/install_congress_1.sh b/components/congress/install/bash/install_congress_1.sh index 8f4676c..423e887 100644 --- a/components/congress/install/bash/install_congress_1.sh +++ b/components/congress/install/bash/install_congress_1.sh @@ -25,7 +25,7 @@ # $ cd ~ # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/install_congress_1.sh # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/install_congress_2.sh -# $ sh install_congress_1.sh [openstack-branch] +# $ bash install_congress_1.sh [openstack-branch] # optionally specifying the branch identifier to use for OpenStack # @@ -69,9 +69,10 @@ EOF echo "install other dependencies" sudo apt-get install apg git gcc python-dev libxml2 libxslt1-dev libzip-dev -y sudo pip install --upgrade pip virtualenv setuptools pbr tox - source ~/admin-openrc.sh <<EOF -openstack -EOF + sed -i -- 's/echo/#echo/g' ~/admin-openrc.sh + sed -i -- 's/read -sr OS_PASSWORD_INPUT/#read -sr OS_PASSWORD_INPUT/g' ~/admin-openrc.sh + sed -i -- 's/$OS_PASSWORD_INPUT/openstack/g' ~/admin-openrc.sh + cp ~/admin-openrc.sh ~/congress else # Centos echo "Centos-based install" diff --git a/components/congress/install/bash/install_congress_2.sh b/components/congress/install/bash/install_congress_2.sh index f2065b8..580b603 100644 --- a/components/congress/install/bash/install_congress_2.sh +++ b/components/congress/install/bash/install_congress_2.sh @@ -25,7 +25,7 @@ # $ cd ~ # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/install_congress_1.sh # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/install_congress_2.sh -# $ source install_congress_1.sh [openstack-branch] +# $ bash install_congress_1.sh [openstack-branch] # optionally specifying the branch identifier to use for OpenStack # @@ -40,9 +40,7 @@ if [ "$dist" == "Ubuntu" ]; then # Ubuntu echo "Ubuntu-based install" export CTLUSER="ubuntu" - source ~/congress/admin-openrc.sh <<EOF -openstack -EOF + source ~/congress/admin-openrc.sh source ~/congress/env.sh echo "Update/upgrade package repos" sudo apt-get update |