Skip to content

Commit a71ebf2

Browse files
hadibhadib
committed
modifying gen-local to support savi folsom
1 parent f53d06f commit a71ebf2

7 files changed

Lines changed: 45 additions & 43 deletions

File tree

‎functions‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,12 @@ function upload_image() {
815815
*) echo "Do not know what to do with $IMAGE_FNAME"; false;;
816816
esac
817817

818+
# Delete old images
819+
old_images=`glance --os-region-name $REGION_NAME --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-list | grep $REGION_NAME-$IMAGE_NAME | awk '{print $2;}'`
820+
if [ ! "$old_images" = "" ]; then
821+
echo $old_images | xargs -n1 glance --os-region-name $REGION_NAME --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-delete || true
822+
fi
823+
818824
if [ "$CONTAINER_FORMAT" = "bare" ]; then
819825
if [ "$UNPACK" = "zcat" ]; then
820826
glance --os-auth-token $token --os-region-name $REGION_NAME --os-image-url http://$GLANCE_HOSTPORT image-create --name "$REGION_NAME-$IMAGE_NAME" --public --container-format=$CONTAINER_FORMAT --disk-format $DISK_FORMAT < <(zcat --force "${IMAGE}")

‎samples/of/agent-localrc‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ENABLED_SERVICES=n-cpu,n-api,n-novnc,quantum,q-agt,rabbit
1+
ENABLED_SERVICES=n-cpu,n-novnc,q-agt
22

33
MYSQL_PASSWORD=${PASSWORD}
44
RABBIT_PASSWORD=${PASSWORD}
@@ -11,7 +11,6 @@ HOST_IP_IFACE=${HOST_IP_IFACE}
1111
PUBLIC_INTERFACE=${HOST_IP_IFACE}
1212
FLAT_INTERFACE=${FLAT_INTERFACE}
1313
FLAT_NETWORK_BRIDGE=br-int
14-
MULTI_HOST=1
1514
OFFLINE=0
1615
LOGFILE=/opt/stack/logs/stack.sh.log
1716
VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP
@@ -21,18 +20,13 @@ MYSQL_HOST=${CONTROLLER_HOST}
2120
RABBIT_HOST=${CONTROLLER_HOST}
2221
GLANCE_HOSTPORT=${CONTROLLER_HOST}:9292
2322
Q_HOST=${CONTROLLER_HOST}
24-
Q_INTERFACE=${FLAT_INTERFACE}
23+
#Q_INTERFACE=${FLAT_INTERFACE}
2524
Q_PLUGIN=${Q_PLUGIN}
2625

2726
RYU_ENABLED_ENABLED_SERVICES=$ENABLED_SERVICES,ryu
2827
RYU_ENABLED_RYU_API_HOST=${RYU_HOST}
2928
RYU_ENABLED_RYU_OFP_HOST=${RYU_HOST}
3029
RYU_ENABLED_RYU_API_PORT=8090
31-
RYU_ENABLED_RYU_REPO=https://github.com/savi-dev/ryu.git
32-
RYU_ENABLED_RYU_BRANCH=silver
33-
RYU_ENABLED_QUANTUM_REPO=https://github.com/savi-dev/quantum.git
34-
RYU_ENABLED_QUANTUM_BRANCH=silver
35-
36-
SERVICE_TOKEN=qweasdzxc
30+
RYU_ENABLED_RYU_OFP_PORT=6634
3731

3832
OVS_ENABLE_TUNNELING=False

‎samples/of/ctrl-localrc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ PUBLIC_SERVICE_HOST=${PUBLIC_SERVICE_HOST}
1313
FLAT_INTERFACE=${FLAT_INTERFACE}
1414
FLAT_NETWORK_BRIDGE=br-int
1515
FLOATING_RANGE=${FLOATING_RANGE}/30
16-
MULTI_HOST=1
1716
OFFLINE=0
1817
LOGFILE=/opt/stack/logs/stack.sh.log
1918
VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP
@@ -26,6 +25,8 @@ FIXED_RANGE_DEMO=10.2.1.0/24
2625
FIXED_NETWORK_SIZE_DEMO=$FIXED_NETWORK_SIZE_ADMIN
2726
FIXED_RANGE_DEMO_GATEWAY=10.2.1.1
2827

28+
DNS_NAME_SERVER=8.8.8.8
29+
2930
GLANCE_API_ENABLED_ENABLED_SERVICES=$ENABLED_SERVICES,g-api
3031
GLANCE_API_ENABLED_GLANCE_REGISTRY_HOST=${GLANCE_REGISTRY_HOST}
3132
GLANCE_API_ENABLED_GLANCE_REGISTRY_PORT=${GLANCE_REGISTRY_PORT}
@@ -40,9 +41,7 @@ GLANCE_REGISTRY_ENABLED_ENABLED_SERVICES=$ENABLED_SERVICES,g-reg
4041
GLANCE_REGISTRY_ENABLED_GLANCE_REGISTRY_AUTH_HOST=${GLANCE_REGISTRY_AUTH_HOST}
4142
GLANCE_REGISTRY_ENABLED_GLANCE_REGISTRY_AUTH_PORT=${GLANCE_REGISTRY_AUTH_PORT}
4243

43-
44-
45-
Q_INTERFACE=${FLAT_INTERFACE}
44+
#Q_INTERFACE=${FLAT_INTERFACE}
4645
Q_PLUGIN=${Q_PLUGIN}
4746
#Q_TUNNEL_ENABLE=1
4847
#Q_TUNNEL_REMOTE_IP_FILE=${REMOTE_IPS}
@@ -51,20 +50,14 @@ RYU_ENABLED_ENABLED_SERVICES=$ENABLED_SERVICES,ryu
5150
RYU_ENABLED_RYU_API_HOST=${RYU_HOST}
5251
RYU_ENABLED_RYU_OFP_HOST=${RYU_HOST}
5352
RYU_ENABLED_RYU_API_PORT=8090
54-
RYU_ENABLED_RYU_OFP_PORT=6633
55-
RYU_ENABLED_RYU_REPO=https://github.com/savi-dev/ryu.git
56-
RYU_ENABLED_RYU_BRANCH=silver
57-
RYU_ENABLED_QUANTUM_REPO=https://github.com/savi-dev/quantum.git
58-
RYU_ENABLED_QUANTUM_BRANCH=silver
53+
RYU_ENABLED_RYU_OFP_PORT=6634
5954

6055
FV_ENABLED_ENABLED_SERVICES="$ENABLED_SERVICES,fv"
6156
FV_ENABLED_RYU_FV_CONFIG=/usr/etc/flowvisor/fv_config.json
6257
FV_ENABLED_RYU_FV_PASSFILE=/usr/etc/flowvisor/passFile
6358
FV_ENABLED_RYU_FV_SLICE_PASS=supersecret
6459
FV_ENABLED_RYU_FV_DEFAULT_SLICE=fvadmin
6560

66-
SERVICE_TOKEN=qweasdzxc
67-
6861
OVS_ENABLE_TUNNELING=False
6962

7063
# Swift configuration

‎samples/of/gen-local.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# supports the following options:
55
# -a) Creates loclrc for compute nodes.
66

7-
ENABLED_SERVICES_CONTROL="key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,mysql,rabbit,quantum,q-svc,q-agt"
7+
ENABLED_SERVICES_CONTROL="key,n-api,n-crt,n-cpu,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,mysql,rabbit,quantum,q-svc,q-agt,q-l3,q-dhcp"
88
set -e
99

1010
function interfaces {
@@ -367,9 +367,7 @@ sed -i -e 's/\${KEYSTONE_TYPE}/'$KEYSTONE_TYPE'/g' localrc
367367
sed -i -e 's/\${REGION_NAME}/'$REGION_NAME'/g' localrc
368368
sed -i -e 's/\${KEYSTONE_AUTH_HOST}/'$KEYSTONE_AUTH_HOST'/g' localrc
369369

370-
if [[ $KEYSTONE_TYPE = "LOCAL" ]]; then
371-
cp $OF_DIR/local.sh.template local.sh
372-
fi
370+
cp $OF_DIR/local.sh.template local.sh
373371

374372
echo "Now run ./stack.sh"
375373

‎stack.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,12 @@ fi
821821
echo_summary "Installing Python prerequisites"
822822
pip_install $(get_packages $FILES/pips | sort -u)
823823

824+
# Quantum clean netns
825+
if is_service_enabled quantum; then
826+
for net in `sudo ip netns list | grep q`; do
827+
sudo ip netns delete $net
828+
done
829+
fi
824830

825831
# Check Out Source
826832
# ----------------
@@ -1124,7 +1130,7 @@ fi
11241130
# Glance
11251131
# ------
11261132

1127-
if is_service_enabled g-reg; then
1133+
if is_service_enabled g-reg g-api; then
11281134
echo_summary "Configuring Glance"
11291135

11301136
init_glance
@@ -1212,11 +1218,6 @@ if is_service_enabled quantum; then
12121218
# Example: OVS_ENABLE_TUNNELING=True
12131219
OVS_ENABLE_TUNNELING=${OVS_ENABLE_TUNNELING:-$ENABLE_TENANT_TUNNELS}
12141220

1215-
# Quantum clean netns
1216-
for net in `sudo ip netns list | grep q`; do
1217-
sudo ip netns delete $net
1218-
done
1219-
12201221
# Put config files in ``/etc/quantum`` for everyone to find
12211222
if [[ ! -d /etc/quantum ]]; then
12221223
sudo mkdir -p /etc/quantum

‎stackrc‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ CINDERCLIENT_REPO=${GIT_BASE}/openstack/python-cinderclient
4444
CINDERCLIENT_BRANCH=master # 1.0.0 20Sep2012: 2e6be694c1
4545

4646
# compute service
47-
NOVA_REPO=${GIT_BASE}/openstack/nova.git
48-
NOVA_BRANCH=stable/folsom
47+
NOVA_REPO=${GIT_BASE}/hadib/nova.git
48+
NOVA_BRANCH=s-folsom
4949

5050
# storage service
5151
SWIFT_REPO=${GIT_BASE}/openstack/swift.git
@@ -54,28 +54,28 @@ SWIFT3_REPO=https://github.com/fujita/swift3.git
5454
SWIFT3_BRANCH=master # 10Jul2012: f216f1b4f2
5555

5656
# python swift client library
57-
SWIFTCLIENT_REPO=${GIT_BASE}/openstack/python-swiftclient
57+
SWIFTCLIENT_REPO=${GIT_BASE}/hadib/python-swiftclient
5858
SWIFTCLIENT_BRANCH=master # 1.2.0 12Sep2012: 68d1550f15
5959

6060
# image catalog service
61-
GLANCE_REPO=${GIT_BASE}/openstack/glance.git
62-
GLANCE_BRANCH=stable/folsom
61+
GLANCE_REPO=${GIT_BASE}/hadib/glance.git
62+
GLANCE_BRANCH=s-folsom
6363

6464
# python glance client library
65-
GLANCECLIENT_REPO=${GIT_BASE}/openstack/python-glanceclient
65+
GLANCECLIENT_REPO=${GIT_BASE}/hadib/python-glanceclient
6666
GLANCECLIENT_BRANCH=master # 0.5.1 11Sep2012: 3f67c461da
6767

6868
# unified auth system (manages accounts/tokens)
69-
KEYSTONE_REPO=${GIT_BASE}/openstack/keystone.git
70-
KEYSTONE_BRANCH=stable/folsom
69+
KEYSTONE_REPO=${GIT_BASE}/mfaraji/keystone.git
70+
KEYSTONE_BRANCH=silver
7171

7272
# a websockets/html5 or flash powered VNC console for vm instances
7373
NOVNC_REPO=https://github.com/kanaka/noVNC.git
7474
NOVNC_BRANCH=master # 21Sep2012: 8dfd916946
7575

7676
# django powered web control panel for openstack
77-
HORIZON_REPO=${GIT_BASE}/openstack/horizon.git
78-
HORIZON_BRANCH=stable/folsom
77+
HORIZON_REPO=${GIT_BASE}/mfaraji/horizon.git
78+
HORIZON_BRANCH=silver
7979

8080
# python client library to nova that horizon (and others) use
8181
NOVACLIENT_REPO=${GIT_BASE}/openstack/python-novaclient.git
@@ -86,12 +86,12 @@ OPENSTACKCLIENT_REPO=${GIT_BASE}/openstack/python-openstackclient.git
8686
OPENSTACKCLIENT_BRANCH=master # 14Sep2012: cd140091b5
8787

8888
# python keystone client library to nova that horizon uses
89-
KEYSTONECLIENT_REPO=${GIT_BASE}/openstack/python-keystoneclient
89+
KEYSTONECLIENT_REPO=${GIT_BASE}/mfaraji/python-keystoneclient
9090
KEYSTONECLIENT_BRANCH=master # 29Sep2012: a8f7879fcf
9191

9292
# quantum service
93-
QUANTUM_REPO=${GIT_BASE}/openstack/quantum
94-
QUANTUM_BRANCH=stable/folsom
93+
QUANTUM_REPO=${GIT_BASE}/hadib/quantum
94+
QUANTUM_BRANCH=s-folsom
9595

9696
# quantum client
9797
QUANTUM_CLIENT_REPO=${GIT_BASE}/openstack/python-quantumclient
@@ -105,6 +105,10 @@ TEMPEST_BRANCH=master # 01Oct2012: 2f5db941f5
105105
HEAT_REPO=${GIT_BASE}/heat-api/heat.git
106106
HEAT_BRANCH=master # 27Sep2012: ed99838c28
107107

108+
# ryu network controller
109+
RYU_REPO=https://github.com/t-lin/ryu.git
110+
RYU_BRANCH=silver-folsom
111+
108112
# Nova hypervisor configuration. We default to libvirt with **kvm** but will
109113
# drop back to **qemu** if we are unable to load the kvm module. ``stack.sh`` can
110114
# also install an **LXC** or **OpenVZ** based system.

‎tests/netns-run.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
echo "all netns:"
3+
ip netns list
4+
echo "running in netns:"
5+
ip netns list | grep $1
6+
sudo ip netns exec `ip netns list | grep $1` $2

0 commit comments

Comments
 (0)