"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "install.sh" between
ec2-api-9.0.0.tar.gz and ec2-api-10.0.0.tar.gz

About: OpenStack EC2 API provides a standalone EC2 (and VPC) API service.
The "Ussuri" series (latest release).

install.sh  (ec2-api-9.0.0):install.sh  (ec2-api-10.0.0)
skipping to change at line 20 skipping to change at line 20
CONNECTION="mysql://ec2api:ec2api@127.0.0.1/ec2api?charset=utf8" CONNECTION="mysql://ec2api:ec2api@127.0.0.1/ec2api?charset=utf8"
LOG_DIR=/var/log/ec2api LOG_DIR=/var/log/ec2api
CONF_DIR=/etc/ec2api CONF_DIR=/etc/ec2api
NOVA_CONF=/etc/nova/nova.conf NOVA_CONF=/etc/nova/nova.conf
CONF_FILE=$CONF_DIR/ec2api.conf CONF_FILE=$CONF_DIR/ec2api.conf
APIPASTE_FILE=$CONF_DIR/api-paste.ini APIPASTE_FILE=$CONF_DIR/api-paste.ini
DATA_DIR=${DATA_DIR:-/var/lib/ec2api} DATA_DIR=${DATA_DIR:-/var/lib/ec2api}
AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api} AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api}
CACHE_BACKEND='oslo_cache.dict'
#Check for environment #Check for environment
if [[ -z "$OS_AUTH_URL" || -z "$OS_USERNAME" || -z "$OS_PASSWORD" ]]; then if [[ -z "$OS_AUTH_URL" || -z "$OS_USERNAME" || -z "$OS_PASSWORD" ]]; then
echo "Please set OS_AUTH_URL, OS_USERNAME, OS_PASSWORD" echo "Please set OS_AUTH_URL, OS_USERNAME, OS_PASSWORD"
exit 1 exit 1
fi fi
if [[ -z "$OS_TENANT_NAME" && -z "$OS_PROJECT_NAME" ]]; then if [[ -z "$OS_TENANT_NAME" && -z "$OS_PROJECT_NAME" ]]; then
echo "Please set OS_TENANT_NAME or OS_PROJECT_NAME" echo "Please set OS_TENANT_NAME or OS_PROJECT_NAME"
exit 1 exit 1
fi fi
skipping to change at line 231 skipping to change at line 229
} }
if [[ -n $(openstack catalog show network) ]]; then if [[ -n $(openstack catalog show network) ]]; then
VPC_SUPPORT="True" VPC_SUPPORT="True"
DISABLE_EC2_CLASSIC="True" DISABLE_EC2_CLASSIC="True"
else else
VPC_SUPPORT="False" VPC_SUPPORT="False"
DISABLE_EC2_CLASSIC="False" DISABLE_EC2_CLASSIC="False"
fi fi
if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then
declare -a newtron_output declare -a neutron_output
readarray -s 3 -t newtron_output < <(openstack network list --external) readarray -s 3 -t neutron_output < <(openstack network list --external)
if ((${#newtron_output[@]} < 2)); then if ((${#neutron_output[@]} < 2)); then
reason="No external network is declared in Neutron." reason="No external network is declared in Neutron."
elif ((${#newtron_output[@]} > 2)); then elif ((${#neutron_output[@]} > 2)); then
reason="More than one external networks are declared in Neutron." reason="More than one external networks are declared in Neutron."
else else
EXTERNAL_NETWORK=$(echo $newtron_output | awk -F '|' '{ print $3 }') EXTERNAL_NETWORK=$(echo $neutron_output | awk -F '|' '{ print $3 }')
fi fi
die_if_not_set $LINENO EXTERNAL_NETWORK "$reason. Please set EXTERNAL_NETWOR K environment variable to the external network dedicated to EC2 elastic IP opera tions" die_if_not_set $LINENO EXTERNAL_NETWORK "$reason. Please set EXTERNAL_NETWOR K environment variable to the external network dedicated to EC2 elastic IP opera tions"
fi fi
#create keystone user with admin and service privileges #create keystone user with admin and service privileges
ADMIN_ROLE=$(openstack role show admin -c id -f value) ADMIN_ROLE=$(openstack role show admin -c id -f value)
die_if_not_set $LINENO ADMIN_ROLE "Fail to get ADMIN_ROLE by 'openstack role sho w' " die_if_not_set $LINENO ADMIN_ROLE "Fail to get ADMIN_ROLE by 'openstack role sho w' "
SERVICE_ROLE=$(openstack role show service -c id -f value) SERVICE_ROLE=$(openstack role show service -c id -f value)
die_if_not_set $LINENO ADMIN_ROLE "Fail to get SERVICE_ROLE by 'openstack role s how' " die_if_not_set $LINENO ADMIN_ROLE "Fail to get SERVICE_ROLE by 'openstack role s how' "
SERVICE_TENANT_ID=$(openstack project show service -c id -f value) SERVICE_TENANT_ID=$(openstack project show service -c id -f value)
skipping to change at line 303 skipping to change at line 301
iniset $CONF_FILE $GROUP_AUTHTOKEN auth_url "$OS_AUTH_URL" iniset $CONF_FILE $GROUP_AUTHTOKEN auth_url "$OS_AUTH_URL"
iniset $CONF_FILE $GROUP_AUTHTOKEN username $SERVICE_USERNAME iniset $CONF_FILE $GROUP_AUTHTOKEN username $SERVICE_USERNAME
iniset $CONF_FILE $GROUP_AUTHTOKEN password $SERVICE_PASSWORD iniset $CONF_FILE $GROUP_AUTHTOKEN password $SERVICE_PASSWORD
iniset $CONF_FILE $GROUP_AUTHTOKEN project_name $SERVICE_TENANT iniset $CONF_FILE $GROUP_AUTHTOKEN project_name $SERVICE_TENANT
iniset $CONF_FILE $GROUP_AUTHTOKEN project_domain_name $SERVICE_DOMAIN_NAME iniset $CONF_FILE $GROUP_AUTHTOKEN project_domain_name $SERVICE_DOMAIN_NAME
iniset $CONF_FILE $GROUP_AUTHTOKEN user_domain_name $SERVICE_DOMAIN_NAME iniset $CONF_FILE $GROUP_AUTHTOKEN user_domain_name $SERVICE_DOMAIN_NAME
iniset $CONF_FILE $GROUP_AUTHTOKEN auth_type password iniset $CONF_FILE $GROUP_AUTHTOKEN auth_type password
GROUP_CACHE="cache" GROUP_CACHE="cache"
iniset $CONF_FILE $GROUP_CACHE enabled True iniset $CONF_FILE $GROUP_CACHE enabled True
iniset $CONF_FILE $GROUP_CACHE backend "$CACHE_BACKEND"
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 $(openstack catalog show object-store 2>/dev/null) ]] && if [[ -n $(openstack catalog show object-store 2>/dev/null) ]] &&
[[ -n $(openstack catalog show s3 2>/dev/null) ]]; then [[ -n $(openstack catalog show s3 2>/dev/null) ]]; then
s3_host="127.0.0.1" s3_host="127.0.0.1"
if ini_has_option "$NOVA_CONF" DEFAULT "s3_host"; then if ini_has_option "$NOVA_CONF" DEFAULT "s3_host"; then
s3_host=$(iniget $NOVA_CONF DEFAULT $option_name) s3_host=$(iniget $NOVA_CONF DEFAULT $option_name)
fi fi
s3_port="3334" s3_port="3334"
 End of changes. 5 change blocks. 
8 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)