openstack
/
ec2-api
Code Issues Proposed changes

Use openstack CLI instead of keystone one in install.sh 

Since keystone CLI is deprecated, install script should use openstack
CLI to do not scare users by a lot of warnings.

Change-Id: I9220cbd1255e808e46b6f88c96a8016002cbfe27
This commit is contained in:
Feodor Tersin 2015-06-29 19:50:40 +03:00
parent c72d53d7ef
commit 2d366b168d
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
install.sh
View File

@ -106,17 +106,18 @@ get_id () {
get_user() { get_user() {
local username=$1 local username=$1
local user_id=$(get_data 2 $username 1 keystone user-list) local user_id=$(openstack user show $username -f value -c id 2>/dev/null)
if [ -n "$user_id" ]; then if [ -n "$user_id" ]; then
echo "Found existing $username user" >&2 echo "Found existing $username user" >&2
echo $user_id echo $user_id
else else
echo "Creating $username user..." >&2 echo "Creating $username user..." >&2
get_id keystone user-create --name=$username \ openstack user create -f value -c id \
--pass="$SERVICE_PASSWORD" \ $username \
--tenant $SERVICE_TENANT \ --password "$SERVICE_PASSWORD" \
--email=$username@example.com --project $SERVICE_TENANT \
--email $username@example.com
fi fi
} }
@ -126,19 +127,19 @@ add_role() {
local role_id=$3 local role_id=$3
local username=$4 local username=$4
user_roles=$(keystone user-role-list \ user_roles=$(openstack user role list -f value -c ID \
--user_id $user_id\ $user_id \
--tenant $tenant 2>/dev/null) --project $tenant 2>/dev/null)
die_if_not_set $LINENO user_roles "Fail to get user_roles for tenant($tenant) and user_id($user_id)" die_if_not_set $LINENO user_roles "Fail to get user_roles for tenant($tenant) and user_id($user_id)"
existing_role=$(get_data 1 $role_id 1 echo "$user_roles") existing_role=$(echo "$user_roles" | grep $role_id || true)
if [ -n "$existing_role" ] if [ -n "$existing_role" ]
then then
echo "User $username already has role $role_id" >&2 echo "User $username already has role $role_id" >&2
return return
fi fi
keystone user-role-add --tenant $tenant \ openstack role add $role_id \
--user_id $user_id \ --user $user_id \
--role_id $role_id --project $tenant
} }
@ -202,7 +203,7 @@ function copynovaopt() {
iniset $CONF_FILE DEFAULT $option_name $option iniset $CONF_FILE DEFAULT $option_name $option
} }
if [[ -n $(keystone catalog --service network) ]]; then if [[ -n $(openstack catalog show network) ]]; then
VPC_SUPPORT="True" VPC_SUPPORT="True"
else else
VPC_SUPPORT="False" VPC_SUPPORT="False"
@ -221,10 +222,10 @@ if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then
fi fi
#create keystone user with admin privileges #create keystone user with admin privileges
ADMIN_ROLE=$(get_data 2 admin 1 keystone role-list) ADMIN_ROLE=$(openstack role show admin -c id -f value)
die_if_not_set $LINENO ADMIN_ROLE "Fail to get ADMIN_ROLE by 'keystone role-list' " die_if_not_set $LINENO ADMIN_ROLE "Fail to get ADMIN_ROLE by 'openstack role show' "
SERVICE_TENANT_ID=$(get_data 2 service 1 keystone tenant-list) SERVICE_TENANT_ID=$(openstack project show service -c id -f value)
die_if_not_set $LINENO SERVICE_TENANT_ID "Fail to get service tenant 'keystone tenant-list' " die_if_not_set $LINENO SERVICE_TENANT_ID "Fail to get service tenant 'openstack project show' "
echo ADMIN_ROLE $ADMIN_ROLE echo ADMIN_ROLE $ADMIN_ROLE
echo SERVICE_TENANT $SERVICE_TENANT echo SERVICE_TENANT $SERVICE_TENANT
@ -253,7 +254,7 @@ fi
AUTH_HOST=${OS_AUTH_URL#*//} AUTH_HOST=${OS_AUTH_URL#*//}
AUTH_HOST=${AUTH_HOST%:*} AUTH_HOST=${AUTH_HOST%:*}
AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api} AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api}
AUTH_PORT=`keystone catalog|grep -A 9 identity|grep adminURL|awk '{print $4}'` AUTH_PORT=`openstack catalog show identity -f value|grep adminURL|awk '{print $2}'`
AUTH_PORT=${AUTH_PORT##*:} AUTH_PORT=${AUTH_PORT##*:}
AUTH_PORT=${AUTH_PORT%%/*} AUTH_PORT=${AUTH_PORT%%/*}
AUTH_PROTO=${OS_AUTH_URL%%:*} AUTH_PROTO=${OS_AUTH_URL%%:*}
@ -283,8 +284,8 @@ iniset $CONF_FILE DEFAULT admin_tenant_name $SERVICE_TENANT
if [[ -f "$NOVA_CONF" ]]; then if [[ -f "$NOVA_CONF" ]]; then
# NOTE(ft): use swift instead internal s3 server if enabled # NOTE(ft): use swift instead internal s3 server if enabled
if [[ -n $(keystone catalog --service object-store) ]] && if [[ -n $(openstack catalog show object-store 2>/dev/null) ]] &&
[[ -n $(keystone catalog --service s3) ]]; then [[ -n $(openstack catalog show s3 2>/dev/null) ]]; then
copynovaopt s3_host copynovaopt s3_host
copynovaopt s3_port copynovaopt s3_port
copynovaopt s3_affix_tenant copynovaopt s3_affix_tenant

1
requirements.txt
View File

@ -21,6 +21,7 @@ python-glanceclient>=0.18.0
python-keystoneclient>=1.6.0 python-keystoneclient>=1.6.0
python-neutronclient>=2.3.11,<3 python-neutronclient>=2.3.11,<3
python-novaclient>=2.22.0 python-novaclient>=2.22.0
python-openstackclient>=1.0.3
Routes>=1.12.3,!=2.0 Routes>=1.12.3,!=2.0
six>=1.9.0 six>=1.9.0
SQLAlchemy>=0.9.7,<1.1.0 SQLAlchemy>=0.9.7,<1.1.0