Browse Source

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
Tong Li 3 years ago
parent
commit
62381080f0
2 changed files with 19 additions and 21 deletions
  1. 6
    7
      requirements.txt
  2. 13
    14
      vagrant/onvm/scripts/install-kiloeyes.sh

+ 6
- 7
requirements.txt View File

@@ -7,16 +7,15 @@ falcon==0.1.9
7 7
 gunicorn==19.1.0
8 8
 iso8601>=0.1.9
9 9
 kafka-python<1.0.0,>=0.9.5
10
-oslo.config>=1.11.0
11
-oslo.i18n>=1.5.0
12
-oslo.log>=1.0.0
13
-oslo.service>=0.1.0
10
+oslo.config>=3.7.0
11
+oslo.i18n>=2.1.0
12
+oslo.log>=1.14.0
13
+oslo.service>=1.0.0
14 14
 pastedeploy>=1.3.3
15 15
 pbr>=1.6
16 16
 python-dateutil>=1.5
17
-six>=1.7.0
17
+six>=1.9.0
18 18
 stevedore>=0.14
19 19
 ujson>=1.33
20
-babel
21
-eventlet
20
+eventlet!=0.18.3,>=0.18.2
22 21
 pyparsing==2.0.1

+ 13
- 14
vagrant/onvm/scripts/install-kiloeyes.sh View File

@@ -31,29 +31,28 @@ mkdir -p $k_log_dir $k_pid_dir
31 31
 if [ $leap_security_on='true' ]; then
32 32
 
33 33
   echo 'Install keystone middleware...'
34
-  apt-get -qqy install software-properties-common
35
-  add-apt-repository -y cloud-archive:liberty
36
-  apt-get update
37
-  apt-get -qqy install python-keystonemiddleware
34
+  pip install keystonemiddleware
38 35
 
39 36
   iniset /etc/kiloeyes/kiloeyes.ini 'pipeline:main' 'pipeline' 'authtoken api'
40 37
   iniset /etc/kiloeyes/kiloeyes.ini 'filter:authtoken' 'paste.filter_factory' 'keystonemiddleware.auth_token:filter_factory'
41 38
   iniset /etc/kiloeyes/kiloeyes.ini 'filter:authtoken' 'delay_auth_decision'  false
42 39
 
43
-  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken identity_uri $leap_auth_uri
44
-  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_type token
45
-  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken admin_user $leap_admin_user
46
-  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken admin_password $leap_admin_pw
47
-  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken admin_tenant_name admin
40
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_uri "${leap_auth_uri}"
41
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_url "${leap_auth_uri}"
42
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken auth_type 'password'
43
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken project_domain_id 'default'
44
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken project_name 'kiloeyes'
45
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken user_domain_id 'default'
46
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken username $leap_agent_user
47
+  iniset /etc/kiloeyes/kiloeyes.conf keystone_authtoken password $leap_agent_pw
48
+
48 49
 fi
49 50
 
50 51
 # if auth_uri is configured, then we need to create these services and users
51 52
 if [ ! -z $leap_auth_uri ]; then
52 53
 
53
-  apt-get -qqy install software-properties-common
54
-  add-apt-repository -y cloud-archive:liberty
55
-  apt-get update
56
-  apt-get -qqy install python-openstackclient
54
+  pip install wrapt python-openstackclient
55
+
57 56
   # Setup environment variables
58 57
   export OS_USERNAME=$leap_admin_user
59 58
   export OS_PASSWORD=$leap_admin_pw
@@ -71,7 +70,7 @@ if [ ! -z $leap_auth_uri ]; then
71 70
 
72 71
     openstack project create --domain default --description "Kiloeyes Project" kiloeyes
73 72
     openstack user create --domain default --password $leap_agent_pw $leap_agent_user
74
-    openstack role add --project kiloeyes --user $leap_agent_user member
73
+    openstack role add --project kiloeyes --user $leap_agent_user admin
75 74
   fi
76 75
 fi
77 76
 

Loading…
Cancel
Save