openstack
/
tripleo-image-elements
Code Issues Proposed changes

Drop usage of keystoneclient 

The keystoneclient cli is now deprecated and will soon be removed so use the
openstack client instead.

Change-Id: Id902647966bfce62cc8dce9802e34ef80390122d
This commit is contained in:
Derek Higgins 2015-04-23 13:27:18 +01:00
parent ab51b13785
commit a0471f9fef
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
elements/tempest/bin/run-tempest
View File

@ -32,17 +32,17 @@ check_environment
cd /opt/stack/tempest
# Tempest needs 2 users, we add them here so that we know their passwords
keystone tenant-get demo_t1 || keystone tenant-create --name demo_t1
keystone user-get demo_t1 || keystone user-create --name demo_t1 --tenant demo_t1 --pass secret
keystone tenant-get demo_t2 || keystone tenant-create --name demo_t2
keystone user-get demo_t2 || keystone user-create --name demo_t2 --tenant demo_t2 --pass secret
openstack project create --or-show demo_t1
openstack user create --project demo_t1 --password secret --or-show demo_t1
openstack project create --or-show demo_t2
openstack user create --project demo_t2 --password secret --or-show demo_t2
# the orchestration tests need this
keystone user-role-add --user admin --role admin --tenant demo_t1 || true
openstack role add --user admin --project demo_t1 admin || true
# Users need either this or the admin role to use swift
keystone user-role-add --user demo_t1 --role _member_ --tenant demo_t1 || true
keystone user-role-add --user demo_t2 --role _member_ --tenant demo_t2 || true
openstack role add --user demo_t1 --project demo_t1 _member_ || true
openstack role add --user demo_t2 --project demo_t2 _member_ || true
# We require that a image is present
USER_IMAGE=$(glance image-show $TEMPEST_IMAGE_NAME)

4
elements/tripleo-cd/bin/prepare-ci-overcloud
View File

@ -14,7 +14,7 @@ $TRIPLEO_ROOT/tripleo-incubator/scripts/assert-users $TRIPLEO_ROOT/tripleo-incub
$TRIPLEO_ROOT/tripleo-incubator/scripts/assert-users $TRIPLEO_ROOT/tripleo-incubator/tripleo-cloud/tripleo-cd-users
# Get the ID of the nodepool tenant
NODEPOOL_TENANT_ID=$(keystone tenant-list | awk '$4=="openstack-nodepool" {print $2}')
NODEPOOL_TENANT_ID=$(openstack project list | awk '$4=="openstack-nodepool" {print $2}')
# Each instance uses 3 ports
neutron quota-update --tenant-id $NODEPOOL_TENANT_ID --port 300
@ -37,7 +37,7 @@ neutron subnet-update $DEFAULTSUBNETID --dns-nameservers list=true 8.8.8.8
# we may already have this so keystone may error
# XXX: we can query this membership.
keystone user-role-add --role Member --user tripleo-ci --tenant openstack-nodepool || true
openstack role add --user tripleo-ci --project openstack-nodepool Member || true
# Create the flavor nodepool uses
nova flavor-show h1.ci || nova flavor-create h1.ci auto 8192 20 1