diff --git a/README.rst b/README.rst index 541c750..e965b39 100644 --- a/README.rst +++ b/README.rst @@ -28,25 +28,22 @@ Valence installation ``$ git clone https://git.openstack.org/openstack/rsc`` - 3. Install all necessary software pre-requisites using the pip requirements file. - - ``$ pip install -r requirements.txt`` - - 5. Execute the 'install_valence.sh' file the Valence root directory. + 3. Execute the 'install_valence.sh' file present in the Valence root directory. + The install script will automatically install the dependencies listed in the requirements.txt file. ``$ sudo bash install_valence.sh`` - 6. Check the values in valence.conf located at /etc/valence/valence.conf + 4. Check the values in valence.conf located at /etc/valence/valence.conf ``set the ip/credentials of podm for which this Valence will interact`` - 7. Check the PYTHON_HOME and other variables in /etc/init/valence.conf + 5. Check the PYTHON_HOME and other variables in /etc/init/valence.conf - 8. Start valence service + 6. Start valence service ``$ sudo service valence start`` - 9. Logs are located at /var/logs/valence/ + 7. Logs are located at /var/logs/valence/ **************** GUI installation diff --git a/install_valence.sh b/install_valence.sh index aaae25b..d5b29ea 100755 --- a/install_valence.sh +++ b/install_valence.sh @@ -38,10 +38,14 @@ cp etc/valence/valence.conf.sample /etc/valence/valence.conf mkdir /var/log/valence chown ${USER}:${USER} /var/log/valence +echo "Installing dependencies from requirements.txt" >> $install_log +pip install -r requirements.txt + echo "Invoking setup.py" >> $install_log python setup.py install if [ $? -ne 0 ]; then - echo "ERROR: setup.py failed. Please fix the error and retry." + echo "ERROR: setup.py failed. Please check $install_log for details. + Please fix the error and retry." exit fi diff --git a/setup.cfg b/setup.cfg index 4153086..d824881 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.rst author = Intel Corporation author-email = openstack-dev@lists.openstack.org -home-page = https://launchpad.net/plasma +home-page = https://launchpad.net/openstack-valence classifier = Environment :: OpenStack Intended Audience :: Information Technology