x
/
kiloeyes
Code Issues Proposed changes

Move to the same level of dependencies as other openstack project. 

The patch will make the dependencies just like other openstack projects.
Also uses the pip install to install dependencies instead of using
apt-get which installs old dependencies.

Change-Id: I13fd773633778960e321635ec6abd3df254f8115
This commit is contained in:
Tong Li 2016-04-01 23:56:58 -04:00
parent f10cb11b7d
commit 62381080f0
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
requirements.txt
View File

@ -7,16 +7,15 @@ falcon==0.1.9
gunicorn==19.1.0
iso8601>=0.1.9
kafka-python<1.0.0,>=0.9.5
oslo.config>=1.11.0
oslo.i18n>=1.5.0
oslo.log>=1.0.0
oslo.service>=0.1.0
oslo.config>=3.7.0
oslo.i18n>=2.1.0
oslo.log>=1.14.0
oslo.service>=1.0.0
pastedeploy>=1.3.3
pbr>=1.6
python-dateutil>=1.5
six>=1.7.0
six>=1.9.0
stevedore>=0.14
ujson>=1.33
babel
eventlet
eventlet!=0.18.3,>=0.18.2
pyparsing==2.0.1

27
vagrant/onvm/scripts/install-kiloeyes.sh
View File

@ -31,29 +31,28 @@ mkdir -p $k_log_dir $k_pid_dir
if [ $leap_security_on='true' ]; then
echo 'Install keystone middleware...'
apt-get -qqy install software-properties-common
add-apt-repository -y cloud-archive:liberty
apt-get update
apt-get -qqy install python-keystonemiddleware
pip install keystonemiddleware
iniset /etc/kiloeyes/kiloeyes.ini 'pipeline:main' 'pipeline' 'authtoken api'
iniset /etc/kiloeyes/kiloeyes.ini 'filter:authtoken' 'paste.filter_factory' 'keystonemiddleware.auth_token:filter_factory'
iniset /etc/kiloeyes/kiloeyes.ini 'filter:authtoken' 'delay_auth_decision' false
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken identity_uri $leap_auth_uri
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_type token
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken admin_user $leap_admin_user
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken admin_password $leap_admin_pw
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken admin_tenant_name admin
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_uri "${leap_auth_uri}"
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_url "${leap_auth_uri}"
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_type 'password'
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken project_domain_id 'default'
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken project_name 'kiloeyes'
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken user_domain_id 'default'
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken username $leap_agent_user
iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken password $leap_agent_pw
fi
# if auth_uri is configured, then we need to create these services and users
if [ ! -z $leap_auth_uri ]; then
apt-get -qqy install software-properties-common
add-apt-repository -y cloud-archive:liberty
apt-get update
apt-get -qqy install python-openstackclient
pip install wrapt python-openstackclient
# Setup environment variables
export OS_USERNAME=$leap_admin_user
export OS_PASSWORD=$leap_admin_pw
@ -71,7 +70,7 @@ if [ ! -z $leap_auth_uri ]; then
openstack project create --domain default --description "Kiloeyes Project" kiloeyes
openstack user create --domain default --password $leap_agent_pw $leap_agent_user
openstack role add --project kiloeyes --user $leap_agent_user member
openstack role add --project kiloeyes --user $leap_agent_user admin
fi
fi