Compare commits
7 Commits
master
...
diablo-eol
| Author | SHA1 | Date | |
|---|---|---|---|
 Clark Boylan
|
4debb1f8eb | ||
|
James E. Blair
|
91a9952262 | ||
|
Kiall Mac Innes
|
fe1ea878ee | ||
|
Anthony Young
|
eb31af87ea | ||
|
Jenkins
|
e021bede0f | ||
|
Jenkins
|
411b3c67a5 | ||
|
Anthony Young
|
91a3a748de |
@@ -11,6 +11,7 @@ Jason Cannavale <jason.cannavale@rackspace.com>
|
||||
Jay Pipes <jaypipes@gmail.com>
|
||||
Jesse Andrews <anotherjesse@gmail.com>
|
||||
Justin Shepherd <galstrom21@gmail.com>
|
||||
Kiall Mac Innes <kiall@managedit.ie>
|
||||
Scott Moser <smoser@ubuntu.com>
|
||||
Todd Willey <xtoddx@gmail.com>
|
||||
Tres Henry <tres@treshenry.net>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ screen
|
||||
unzip
|
||||
wget
|
||||
psmisc
|
||||
git-core
|
||||
git
|
||||
lsof # useful when debugging
|
||||
openssh-server
|
||||
vim-nox
|
||||
|
||||
@@ -33,10 +33,10 @@ $BIN_DIR/keystone-manage $* service add keystone identity "Keystone Identity Ser
|
||||
$BIN_DIR/keystone-manage $* service add swift object-store "Swift Service"
|
||||
|
||||
#endpointTemplates
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne nova http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:35357/v2.0 http://%HOST_IP%:5000/v2.0 1 1
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne nova http://%SERVICE_HOST%:8774/v1.1/%tenant_id% http://%SERVICE_HOST%:8774/v1.1/%tenant_id% http://%SERVICE_HOST%:8774/v1.1/%tenant_id% 1 1
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%SERVICE_HOST%:9292/v1 http://%SERVICE_HOST%:9292/v1 http://%SERVICE_HOST%:9292/v1 1 1
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%SERVICE_HOST%:5000/v2.0 http://%SERVICE_HOST%:35357/v2.0 http://%SERVICE_HOST%:5000/v2.0 1 1
|
||||
$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% http://%SERVICE_HOST%:8080/ http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% 1 1
|
||||
|
||||
# Tokens
|
||||
$BIN_DIR/keystone-manage $* token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
Cmnd_Alias NOVACMDS = /bin/chmod /var/lib/nova/tmp/*/root/.ssh, \
|
||||
Cmnd_Alias NOVADEVCMDS = /bin/chmod /var/lib/nova/tmp/*/root/.ssh, \
|
||||
/bin/chown /var/lib/nova/tmp/*/root/.ssh, \
|
||||
/bin/chown, \
|
||||
/bin/chmod, \
|
||||
@@ -43,5 +43,5 @@ Cmnd_Alias NOVACMDS = /bin/chmod /var/lib/nova/tmp/*/root/.ssh, \
|
||||
/usr/sbin/dnsmasq, \
|
||||
/usr/sbin/arping
|
||||
|
||||
%USER% ALL = (root) NOPASSWD: SETENV: NOVACMDS
|
||||
%USER% ALL = (root) NOPASSWD: SETENV: NOVADEVCMDS
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
# Load local configuration
|
||||
source ./stackrc
|
||||
|
||||
# Set api host endpoint
|
||||
# Set api host endpoint, defaulting to HOST_IP but allowing override by SERVICE_HOST
|
||||
HOST_IP=${HOST_IP:-127.0.0.1}
|
||||
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
|
||||
|
||||
# Nova original used project_id as the *account* that owned resources (servers,
|
||||
# ip address, ...) With the addition of Keystone we have standardized on the
|
||||
@@ -15,7 +16,7 @@ export NOVA_PROJECT_ID=${TENANT:-demo}
|
||||
|
||||
# In addition to the owning entity (tenant), nova stores the entity performing
|
||||
# the action as the **user**.
|
||||
export NOVA_USERNAME=${USERNAME:-demo}
|
||||
export NOVA_USERNAME=${NOVA_USERNAME:-demo}
|
||||
|
||||
# With Keystone you pass the keystone password instead of an api key.
|
||||
# The most recent versions of novaclient use NOVA_PASSWORD instead of NOVA_API_KEY
|
||||
@@ -29,7 +30,7 @@ export NOVA_PASSWORD=${ADMIN_PASSWORD:-secrete}
|
||||
#
|
||||
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We
|
||||
# will use the 1.1 *compute api*
|
||||
export NOVA_URL=${NOVA_URL:-http://$HOST_IP:5000/v2.0/}
|
||||
export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
|
||||
|
||||
# Currently novaclient needs you to specify the *compute api* version. This
|
||||
# needs to match the config of your catalog returned by Keystone.
|
||||
@@ -39,10 +40,10 @@ export NOVA_VERSION=${NOVA_VERSION:-1.1}
|
||||
export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
|
||||
|
||||
# Set the ec2 url so euca2ools works
|
||||
export EC2_URL=${EC2_URL:-http://$HOST_IP:8773/services/Cloud}
|
||||
export EC2_URL=${EC2_URL:-http://$SERVICE_HOST:8773/services/Cloud}
|
||||
|
||||
# Access key is set in the initial keystone data to be the same as username
|
||||
export EC2_ACCESS_KEY=${USERNAME:-demo}
|
||||
export EC2_ACCESS_KEY=${NOVA_USERNAME:-demo}
|
||||
|
||||
# Secret key is set in the initial keystone data to the admin password
|
||||
export EC2_SECRET_KEY=${ADMIN_PASSWORD:-secrete}
|
||||
|
||||
@@ -232,12 +232,14 @@ function read_password {
|
||||
# FIXME: more documentation about why these are important flags. Also
|
||||
# we should make sure we use the same variable names as the flag names.
|
||||
|
||||
# Allow the use of an alternate hostname (such as localhost/127.0.0.1) for service endpoints.
|
||||
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
|
||||
PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-eth0}
|
||||
FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
|
||||
FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}
|
||||
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28}
|
||||
NET_MAN=${NET_MAN:-FlatDHCPManager}
|
||||
EC2_DMZ_HOST=${EC2_DMZ_HOST:-$HOST_IP}
|
||||
EC2_DMZ_HOST=${EC2_DMZ_HOST:-$SERVICE_HOST}
|
||||
FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-br100}
|
||||
VLAN_INTERFACE=${VLAN_INTERFACE:-$PUBLIC_INTERFACE}
|
||||
|
||||
@@ -299,7 +301,7 @@ RABBIT_HOST=${RABBIT_HOST:-localhost}
|
||||
read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."
|
||||
|
||||
# Glance connection info. Note the port must be specified.
|
||||
GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}
|
||||
GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$SERVICE_HOST:9292}
|
||||
|
||||
# SWIFT
|
||||
# -----
|
||||
@@ -475,9 +477,9 @@ git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH
|
||||
git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH
|
||||
|
||||
# glance, swift middleware and nova api needs keystone middleware
|
||||
if [[ "$ENABLED_SERVICES" =~ "key" ||
|
||||
"$ENABLED_SERVICES" =~ "g-api" ||
|
||||
"$ENABLED_SERVICES" =~ "n-api" ||
|
||||
if [[ "$ENABLED_SERVICES" =~ "key" ||
|
||||
"$ENABLED_SERVICES" =~ "g-api" ||
|
||||
"$ENABLED_SERVICES" =~ "n-api" ||
|
||||
"$ENABLED_SERVICES" =~ "swift" ]]; then
|
||||
# unified auth system (manages accounts/tokens)
|
||||
git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
|
||||
@@ -517,9 +519,9 @@ fi
|
||||
|
||||
# setup our checkouts so they are installed into python path
|
||||
# allowing ``import nova`` or ``import glance.client``
|
||||
if [[ "$ENABLED_SERVICES" =~ "key" ||
|
||||
"$ENABLED_SERVICES" =~ "g-api" ||
|
||||
"$ENABLED_SERVICES" =~ "n-api" ||
|
||||
if [[ "$ENABLED_SERVICES" =~ "key" ||
|
||||
"$ENABLED_SERVICES" =~ "g-api" ||
|
||||
"$ENABLED_SERVICES" =~ "n-api" ||
|
||||
"$ENABLED_SERVICES" =~ "swift" ]]; then
|
||||
cd $KEYSTONE_DIR; sudo python setup.py develop
|
||||
fi
|
||||
@@ -937,7 +939,7 @@ if [[ "$ENABLED_SERVICES" =~ "openstackx" ]]; then
|
||||
add_nova_flag "--osapi_extensions_path=$OPENSTACKX_DIR/extensions"
|
||||
fi
|
||||
if [[ "$ENABLED_SERVICES" =~ "n-vnc" ]]; then
|
||||
add_nova_flag "--vncproxy_url=http://$HOST_IP:6080"
|
||||
add_nova_flag "--vncproxy_url=http://$SERVICE_HOST:6080"
|
||||
add_nova_flag "--vncproxy_wwwroot=$NOVNC_DIR/"
|
||||
fi
|
||||
add_nova_flag "--api_paste_config=$NOVA_DIR/bin/nova-api-paste.ini"
|
||||
@@ -961,7 +963,7 @@ fi
|
||||
# You can define extra nova conf flags by defining the array EXTRA_FLAGS,
|
||||
# For Example: EXTRA_FLAGS=(--foo --bar=2)
|
||||
for I in "${EXTRA_FLAGS[@]}"; do
|
||||
add_nova_flag $i
|
||||
add_nova_flag $I
|
||||
done
|
||||
|
||||
# XenServer
|
||||
@@ -1017,7 +1019,7 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
||||
# keystone_data.sh creates our admin user and our ``SERVICE_TOKEN``.
|
||||
KEYSTONE_DATA=$KEYSTONE_DIR/bin/keystone_data.sh
|
||||
cp $FILES/keystone_data.sh $KEYSTONE_DATA
|
||||
sudo sed -e "s,%HOST_IP%,$HOST_IP,g" -i $KEYSTONE_DATA
|
||||
sudo sed -e "s,%SERVICE_HOST%,$SERVICE_HOST,g" -i $KEYSTONE_DATA
|
||||
sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $KEYSTONE_DATA
|
||||
sudo sed -e "s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g" -i $KEYSTONE_DATA
|
||||
# initialize keystone with default users/endpoints
|
||||
@@ -1229,12 +1231,12 @@ echo ""
|
||||
# If you installed the horizon on this server, then you should be able
|
||||
# to access the site using your browser.
|
||||
if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
|
||||
echo "horizon is now available at http://$HOST_IP/"
|
||||
echo "horizon is now available at http://$SERVICE_HOST/"
|
||||
fi
|
||||
|
||||
# If keystone is present, you can point nova cli to this server
|
||||
if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
||||
echo "keystone is serving at http://$HOST_IP:5000/v2.0/"
|
||||
echo "keystone is serving at http://$SERVICE_HOST:5000/v2.0/"
|
||||
echo "examples on using novaclient command line is in exercise.sh"
|
||||
echo "the default users are: admin and demo"
|
||||
echo "the password: $ADMIN_PASSWORD"
|
||||
|
||||
Reference in New Issue
Block a user