Update to 8.0.0~b3

[openstack-build/neutron-build.git] / tests / runtests.sh

diff --git a/tests/runtests.sh b/tests/runtests.sh
index ba8e0322ace82add9c19faabc394867b8d9c9870..91f3d12093f163df1520a9b4ee2a285092f72ae9 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -86,10 +86,6 @@ setup_database() {
 
 setup_keystone() {
     #Setup Keystone
-    if ! $UBUNTU
-    then
-        cp /usr/share/keystone/keystone-dist-paste.ini /etc/keystone/keystone-paste.ini
-    fi
     cat > /etc/keystone/keystone.conf << EOF
 [DEFAULT]
 admin_token=$TOKEN
@@ -99,6 +95,7 @@ connection=mysql://keystone:keystone@localhost/keystone
 provider=keystone.token.providers.uuid.Provider
 EOF
     keystone-manage db_sync
+    keystone-manage bootstrap --bootstrap-password $TOKEN
     chown -R keystone:keystone /var/log/keystone/
     if $UBUNTU
     then
@@ -110,7 +107,6 @@ EOF
     #Setup Neutron credentials
     keystone $AUTH user-create --name neutron --pass neutron
     keystone $AUTH tenant-create --name neutron
-    keystone $AUTH role-create --name=admin
     keystone $AUTH user-role-add --user neutron --role admin --tenant neutron
     NEUTRON_SERVICE=`keystone $AUTH service-create --name=neutron --type=network --description="Neutron Networking Service" | grep id | awk -F '|' '{print $3}' | tr -d ' '`
     keystone $AUTH endpoint-create --region RegionOne --service-id=$NEUTRON_SERVICE --publicurl=http://localhost:9696 --internalurl=http://localhost:9696 --adminurl=http://localhost:9696