Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
f45d3eb
started a new idea
Nov 7, 2012
8fd1045
trying a new network architecture
Nov 7, 2012
8175249
Adding GRE networkinrg
Nov 7, 2012
b2e0a39
Adding GRE networkinrg
Nov 7, 2012
9951016
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 8, 2012
30dc6ab
fixing networking
Nov 8, 2012
c3df61c
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 8, 2012
435f024
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 8, 2012
952e64b
Added instruction to IP_Forwarding section
Nov 9, 2012
914c845
Added notes
Nov 9, 2012
cc78f5e
added apt-get install openvswitch-datapath-dkms
Nov 9, 2012
b1c59a9
added openvswitch-datapath-dkms
Nov 9, 2012
1169fa7
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 9, 2012
75b5d8b
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 9, 2012
d915159
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 10, 2012
babeb0b
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 10, 2012
778779b
GRE-Tunneling => Stable
Nov 11, 2012
2e248c1
Added modification to l3_agent
Nov 11, 2012
7dddbb0
Merge branch 'GRE-Tunneling' of https://github.com/mseknibilel/OpenSt…
Nov 11, 2012
128a300
Added modification on l3_agent
Nov 11, 2012
11d0ad6
Update README.md
Nov 11, 2012
c0ec366
new README
Nov 11, 2012
009497c
Update README.md
Nov 11, 2012
49aa2f1
new branch name
Nov 11, 2012
2eb5492
new branch name
Nov 11, 2012
aaa88e6
renamed branch
Nov 11, 2012
4f85a14
Update README.md
Nov 11, 2012
62b5a6b
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 14, 2012
006da6b
added a credit section
Nov 16, 2012
a7921fb
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 16, 2012
9159d9a
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 16, 2012
b4c62fd
updated the guide
Nov 16, 2012
769e6ef
Merge branch 'stable/GRE' of https://github.com/mseknibilel/OpenStack…
Nov 16, 2012
4f53644
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 25, 2012
9c0c90a
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 25, 2012
e161db2
Adding a new install way
Nov 25, 2012
4c102c1
Adding a new install way
Nov 25, 2012
0a2493e
Adding a new install way
Nov 25, 2012
55f5599
Update Keystone_Scripts/keystone_endpoints_basic.sh
Nov 26, 2012
c06c7bd
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 26, 2012
5ca6879
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 26, 2012
0140f93
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 26, 2012
87b8984
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 26, 2012
78aab6e
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 26, 2012
e2e65be
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 26, 2012
65a8824
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 27, 2012
2a087e6
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 28, 2012
defc101
Separated Network Node from Controller Node
Nov 28, 2012
99ec39c
Separated Network Node from Controller Node
Nov 28, 2012
65079b3
Update README.md
Nov 30, 2012
4d85280
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 30, 2012
9ef1060
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Nov 30, 2012
a175cd7
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Dec 2, 2012
aca05ed
Update Keystone_Scripts/keystone_endpoints_basic.sh
Dec 2, 2012
acdd069
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Dec 5, 2012
8e9dd69
Update Keystone_Scripts/keystone_endpoints_basic.sh
Dec 5, 2012
18cae4f
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Dec 5, 2012
ae9904c
Update Keystone_Scripts/keystone_basic.sh
Dec 17, 2012
cf1ef8f
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Dec 17, 2012
05d25c4
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Jan 9, 2013
8b81c85
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Jan 15, 2013
0f5124d
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
Jan 24, 2013
26f0ddd
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
bilelmsekni Apr 2, 2013
3023100
Edited OpenStack_Folsom_Install_Guide_WebVersion.rst
chathura77 May 26, 2013
620ec7b
modified: OpenStack_Folsom_Install_Guide_WebVersion.rst
chathura77 May 26, 2013
916baee
Update README.md
chathura77 May 27, 2013
3015fdf
Update README.md
chathura77 May 27, 2013
07c3c92
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
chathura77 Jun 24, 2013
690156e
Update OpenStack_Folsom_Install_Guide_WebVersion.rst
chathura77 Apr 7, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Keystone_Scripts/keystone_basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Support: openstack@lists.launchpad.net
# License: Apache Software License (ASL) 2.0
#
HOST_IP=192.168.100.232
HOST_IP=100.10.10.51
ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin_pass}
SERVICE_PASSWORD=${SERVICE_PASSWORD:-service_pass}
export SERVICE_TOKEN="ADMIN"
Expand Down
56 changes: 56 additions & 0 deletions Keystone_Scripts/keystone_basic.sh~
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#!/bin/sh
#
# Keystone basic configuration

# Mainly inspired by https://github.com/openstack/keystone/blob/master/tools/sample_data.sh

# Modified by Bilel Msekni / Institut Telecom
#
# Support: openstack@lists.launchpad.net
# License: Apache Software License (ASL) 2.0
#
HOST_IP=192.168.100.232
ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin_pass}
SERVICE_PASSWORD=${SERVICE_PASSWORD:-service_pass}
export SERVICE_TOKEN="ADMIN"
export SERVICE_ENDPOINT="http://${HOST_IP}:35357/v2.0"
SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME:-service}

get_id () {
echo `$@ | awk '/ id / { print $4 }'`
}

# Tenants
ADMIN_TENANT=$(get_id keystone tenant-create --name=admin)
SERVICE_TENANT=$(get_id keystone tenant-create --name=$SERVICE_TENANT_NAME)


# Users
ADMIN_USER=$(get_id keystone user-create --name=admin --pass="$ADMIN_PASSWORD" --email=admin@domain.com)


# Roles
ADMIN_ROLE=$(get_id keystone role-create --name=admin)
KEYSTONEADMIN_ROLE=$(get_id keystone role-create --name=KeystoneAdmin)
KEYSTONESERVICE_ROLE=$(get_id keystone role-create --name=KeystoneServiceAdmin)

# Add Roles to Users in Tenants
keystone user-role-add --user-id $ADMIN_USER --role-id $ADMIN_ROLE --tenant-id $ADMIN_TENANT
keystone user-role-add --user-id $ADMIN_USER --role-id $KEYSTONEADMIN_ROLE --tenant-id $ADMIN_TENANT
keystone user-role-add --user-id $ADMIN_USER --role-id $KEYSTONESERVICE_ROLE --tenant-id $ADMIN_TENANT

# The Member role is used by Horizon and Swift
MEMBER_ROLE=$(get_id keystone role-create --name=Member)

# Configure service users/roles
NOVA_USER=$(get_id keystone user-create --name=nova --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=nova@domain.com)
keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $NOVA_USER --role-id $ADMIN_ROLE

GLANCE_USER=$(get_id keystone user-create --name=glance --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=glance@domain.com)
keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $GLANCE_USER --role-id $ADMIN_ROLE

QUANTUM_USER=$(get_id keystone user-create --name=quantum --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=quantum@domain.com)
keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $QUANTUM_USER --role-id $ADMIN_ROLE

CINDER_USER=$(get_id keystone user-create --name=cinder --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=cinder@domain.com)
keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $CINDER_USER --role-id $ADMIN_ROLE
17 changes: 9 additions & 8 deletions Keystone_Scripts/keystone_endpoints_basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
#

# Host address
HOST_IP=192.168.100.232
HOST_IP=100.10.10.51
EXT_HOST_IP=192.168.100.51

# MySQL definitions
MYSQL_USER=keystoneUser
MYSQL_DATABASE=keystone
MYSQL_HOST=${HOST_IP}
MYSQL_HOST=$HOST_IP
MYSQL_PASSWORD=keystonePass

# Keystone definitions
Expand Down Expand Up @@ -108,22 +109,22 @@ keystone service-create --name quantum --type network --description 'OpenStack N
create_endpoint () {
case $1 in
compute)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s' --adminurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s' --internalurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s'
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$EXT_HOST_IP"':8774/v2/$(tenant_id)s' --adminurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s' --internalurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s'
;;
volume)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s' --adminurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s' --internalurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s'
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$EXT_HOST_IP"':8776/v1/$(tenant_id)s' --adminurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s' --internalurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s'
;;
image)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':9292/v2' --adminurl 'http://'"$HOST_IP"':9292/v2' --internalurl 'http://'"$HOST_IP"':9292/v2'
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$EXT_HOST_IP"':9292/v2' --adminurl 'http://'"$HOST_IP"':9292/v2' --internalurl 'http://'"$HOST_IP"':9292/v2'
;;
identity)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':5000/v2.0' --adminurl 'http://'"$HOST_IP"':35357/v2.0' --internalurl 'http://'"$HOST_IP"':5000/v2.0'
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$EXT_HOST_IP"':5000/v2.0' --adminurl 'http://'"$HOST_IP"':35357/v2.0' --internalurl 'http://'"$HOST_IP"':5000/v2.0'
;;
ec2)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':8773/services/Cloud' --adminurl 'http://'"$HOST_IP"':8773/services/Admin' --internalurl 'http://'"$HOST_IP"':8773/services/Cloud'
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$EXT_HOST_IP"':8773/services/Cloud' --adminurl 'http://'"$HOST_IP"':8773/services/Admin' --internalurl 'http://'"$HOST_IP"':8773/services/Cloud'
;;
network)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':9696/' --adminurl 'http://'"$HOST_IP"':9696/' --internalurl 'http://'"$HOST_IP"':9696/'
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$EXT_HOST_IP"':9696/' --adminurl 'http://'"$HOST_IP"':9696/' --internalurl 'http://'"$HOST_IP"':9696/'
;;
esac
}
Expand Down
134 changes: 134 additions & 0 deletions Keystone_Scripts/keystone_endpoints_basic.sh~
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
#!/bin/sh
#
# Keystone basic Endpoints

# Mainly inspired by https://github.com/openstack/keystone/blob/master/tools/sample_data.sh

# Modified by Bilel Msekni / Institut Telecom
#
# Support: openstack@lists.launchpad.net
# License: Apache Software License (ASL) 2.0
#

# Host address
HOST_IP=192.168.100.232

# MySQL definitions
MYSQL_USER=keystoneUser
MYSQL_DATABASE=keystone
MYSQL_HOST=localhost
MYSQL_PASSWORD=keystonePass

# Keystone definitions
KEYSTONE_REGION=RegionOne
export SERVICE_TOKEN=ADMIN
export SERVICE_ENDPOINT="http://${HOST_IP}:35357/v2.0"

while getopts "u:D:p:m:K:R:E:T:vh" opt; do
case $opt in
u)
MYSQL_USER=$OPTARG
;;
D)
MYSQL_DATABASE=$OPTARG
;;
p)
MYSQL_PASSWORD=$OPTARG
;;
m)
MYSQL_HOST=$OPTARG
;;
K)
MASTER=$OPTARG
;;
R)
KEYSTONE_REGION=$OPTARG
;;
E)
export SERVICE_ENDPOINT=$OPTARG
;;
T)
export SERVICE_TOKEN=$OPTARG
;;
v)
set -x
;;
h)
cat <<EOF
Usage: $0 [-m mysql_hostname] [-u mysql_username] [-D mysql_database] [-p mysql_password]
[-K keystone_master ] [ -R keystone_region ] [ -E keystone_endpoint_url ]
[ -T keystone_token ]

Add -v for verbose mode, -h to display this message.
EOF
exit 0
;;
\?)
echo "Unknown option -$OPTARG" >&2
exit 1
;;
:)
echo "Option -$OPTARG requires an argument" >&2
exit 1
;;
esac
done

if [ -z "$KEYSTONE_REGION" ]; then
echo "Keystone region not set. Please set with -R option or set KEYSTONE_REGION variable." >&2
missing_args="true"
fi

if [ -z "$SERVICE_TOKEN" ]; then
echo "Keystone service token not set. Please set with -T option or set SERVICE_TOKEN variable." >&2
missing_args="true"
fi

if [ -z "$SERVICE_ENDPOINT" ]; then
echo "Keystone service endpoint not set. Please set with -E option or set SERVICE_ENDPOINT variable." >&2
missing_args="true"
fi

if [ -z "$MYSQL_PASSWORD" ]; then
echo "MySQL password not set. Please set with -p option or set MYSQL_PASSWORD variable." >&2
missing_args="true"
fi

if [ -n "$missing_args" ]; then
exit 1
fi

keystone service-create --name nova --type compute --description 'OpenStack Compute Service'
keystone service-create --name cinder --type volume --description 'OpenStack Volume Service'
keystone service-create --name glance --type image --description 'OpenStack Image Service'
keystone service-create --name keystone --type identity --description 'OpenStack Identity'
keystone service-create --name ec2 --type ec2 --description 'OpenStack EC2 service'
keystone service-create --name quantum --type network --description 'OpenStack Networking service'

create_endpoint () {
case $1 in
compute)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s' --adminurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s' --internalurl 'http://'"$HOST_IP"':8774/v2/$(tenant_id)s'
;;
volume)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s' --adminurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s' --internalurl 'http://'"$HOST_IP"':8776/v1/$(tenant_id)s'
;;
image)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':9292/v2' --adminurl 'http://'"$HOST_IP"':9292/v2' --internalurl 'http://'"$HOST_IP"':9292/v2'
;;
identity)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':5000/v2.0' --adminurl 'http://'"$HOST_IP"':35357/v2.0' --internalurl 'http://'"$HOST_IP"':5000/v2.0'
;;
ec2)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':8773/services/Cloud' --adminurl 'http://'"$HOST_IP"':8773/services/Admin' --internalurl 'http://'"$HOST_IP"':8773/services/Cloud'
;;
network)
keystone endpoint-create --region $KEYSTONE_REGION --service-id $2 --publicurl 'http://'"$HOST_IP"':9696/' --adminurl 'http://'"$HOST_IP"':9696/' --internalurl 'http://'"$HOST_IP"':9696/'
;;
esac
}

for i in compute volume image object-store identity ec2 network; do
id=`mysql -h "$MYSQL_HOST" -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" -ss -e "SELECT id FROM service WHERE type='"$i"';"` || exit 1
create_endpoint $i $id
done
Loading