Commit dfb8e86f authored by Alain Takoudjou's avatar Alain Takoudjou

switch to ubuntu 13.04 for more stability

parent 02740d4f
...@@ -315,7 +315,8 @@ virtual-hard-drive-md5sum = ...@@ -315,7 +315,8 @@ virtual-hard-drive-md5sum =
cpu-count = 4 cpu-count = 4
nbd-port = 1024 nbd-port = 1024
nbd-host = 2001:470:1f14:169:dd6b:3f84:9205:c750 #Use Ubuntu 13.04 server
nbd-host = 2001:470:1f14:169:dd6b:3f84:9205:6218
nbd2-port = 1024 nbd2-port = 1024
nbd2-host = nbd2-host =
...@@ -329,6 +330,3 @@ glance-image-name = cirros-0.3.1-x86_64 ...@@ -329,6 +330,3 @@ glance-image-name = cirros-0.3.1-x86_64
domain = domain =
virtual-hard-drive-url = virtual-hard-drive-url =
virtual-hard-drive-md5sum = virtual-hard-drive-md5sum =
#Using devstack to auto install openstack. We just specify here the commit to use
#devstack-revision =
\ No newline at end of file
...@@ -154,103 +154,3 @@ signature-certificate-list = ...@@ -154,103 +154,3 @@ signature-certificate-list =
-----END CERTIFICATE----- -----END CERTIFICATE-----
[versions] [versions]
Jinja2 = 2.7.1
MarkupSafe = 0.18
Werkzeug = 0.9.4
apache-libcloud = 0.13.2
async = 0.6.1
buildout-versions = 1.7
gitdb = 0.5.4
itsdangerous = 0.23
lxml = 3.2.3
meld3 = 0.6.10
paramiko = 1.12.0
plone.recipe.command = 1.1
pycrypto = 2.6
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.5
slapos.toolbox = 0.37
smmap = 0.8.2
websockify = 0.5.1
z3c.recipe.scripts = 1.0.1
# Required by:
# slapos.core==0.35.1
# slapos.toolbox==0.37
Flask = 0.10.1
# Required by:
# slapos.toolbox==0.37
GitPython = 0.3.2.RC1
# Required by:
# slapos.toolbox==0.37
atomize = 0.1.1
# Required by:
# paramiko==1.12.0
ecdsa = 0.9
# Required by:
# slapos.toolbox==0.37
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.83.1
inotifyx = 0.2.0-1
# Required by:
# slapos.cookbook==0.83.1
lock-file = 2.0
# Required by:
# slapos.cookbook==0.83.1
netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.8-1
# Required by:
# websockify==0.5.1
numpy = 1.7.1
# Required by:
# slapos.toolbox==0.37
psutil = 1.1.0
# Required by:
# slapos.core==0.35.1
pyflakes = 0.7.3
# Required by:
# slapos.cookbook==0.83.1
pytz = 2013.7
# Required by:
# slapos.cookbook==0.83.1
# slapos.toolbox==0.37
slapos.core = 0.35.1
# Required by:
# slapos.core==0.35.1
supervisor = 3.0
# Required by:
# slapos.core==0.35.1
unittest2 = 0.5.1
# Required by:
# slapos.cookbook==0.83.1
# slapos.toolbox==0.37
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
cliff = 1.4.5
cmd2 = 0.6.7
pyparsing = 2.0.1
requests = 2.0.0
\ No newline at end of file
...@@ -2,25 +2,20 @@ ...@@ -2,25 +2,20 @@
#stack_controller_grizzly.sh: Should install and configure all needed openstack packages. #stack_controller_grizzly.sh: Should install and configure all needed openstack packages.
#This script should work on SlapOS environment, using a Virtual Machine #This script should work on SlapOS environment, using a Virtual Machine
# Warning: this script has been tested only on Ubuntu 12.04. # Warning: this script may not work on Ubuntu 12.04 - Use ubuntu 13.04
#sudo su
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt-get -y install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring
echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >> /etc/apt/sources.list.d/grizzly.list
apt-get update apt-get update
apt-get -y upgrade apt-get upgrade -y
apt-get -y dist-upgrade apt-get dist-upgrade -y
############################################################################################### ###############################################################################################
##### Configure Network ##### Configure Network
############################################################################################### ###############################################################################################
apt-get install -y openvswitch-switch openvswitch-datapath-lts-raring-dkms apt-get install -y openvswitch-switch openvswitch-datapath-dkms
apt-get install -y vlan bridge-utils apt-get install -y vlan bridge-utils
#br-int will be used for VM integration #br-int will be used for VM integration
...@@ -89,9 +84,21 @@ sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/' /etc/sysctl.conf ...@@ -89,9 +84,21 @@ sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/' /etc/sysctl.conf
# To save you from rebooting, perform the following # To save you from rebooting, perform the following
sysctl net.ipv4.ip_forward=1 sysctl net.ipv4.ip_forward=1
iptables --table nat --append POSTROUTING --out-interface eth1 -j MASQUERADE iptables --table nat --append POSTROUTING --out-interface eth0 -j MASQUERADE
iptables --append FORWARD --in-interface br-ex -j ACCEPT
#Add iptable command to rc.local to allow auto reconfiguring of network NAT after reboot
sudo sed -n '$!p' /etc/rc.local > temp-rc.local
sudo mv temp-rc.local /etc/rc.local
sudo chmod +x /etc/rc.local
/bin/cat << EOF >> /etc/rc.local
iptables --table nat --append POSTROUTING --out-interface eth0 -j MASQUERADE
iptables --append FORWARD --in-interface br-ex -j ACCEPT iptables --append FORWARD --in-interface br-ex -j ACCEPT
exit 0
EOF
############################################################################################### ###############################################################################################
##### Variables to use ##### Variables to use
############################################################################################### ###############################################################################################
...@@ -129,7 +136,13 @@ apt-get install -y rabbitmq-server ...@@ -129,7 +136,13 @@ apt-get install -y rabbitmq-server
apt-get install -y ntp apt-get install -y ntp
sed -i 's/server ntp.ubuntu.com/server ntp.ubuntu.com\nserver 127.127.1.0\nfudge 127.127.1.0 stratum 10/g' /etc/ntp.conf #Comment the ubuntu NTP servers
sed -i 's/server 0.ubuntu.pool.ntp.org/#server 0.ubuntu.pool.ntp.org/g' /etc/ntp.conf
sed -i 's/server 1.ubuntu.pool.ntp.org/#server 1.ubuntu.pool.ntp.org/g' /etc/ntp.conf
sed -i 's/server 2.ubuntu.pool.ntp.org/#server 2.ubuntu.pool.ntp.org/g' /etc/ntp.conf
sed -i 's/server 3.ubuntu.pool.ntp.org/#server 3.ubuntu.pool.ntp.org/g' /etc/ntp.conf
sed -e 's/server ntp.ubuntu.com/server $PUBLIC_ADDRESS/g' /etc/ntp.conf
service ntp restart service ntp restart
sleep 1.5 sleep 1.5
...@@ -320,6 +333,13 @@ sed -e "s/^auth_host *=.*/auth_host = $HOST_IP/" \ ...@@ -320,6 +333,13 @@ sed -e "s/^auth_host *=.*/auth_host = $HOST_IP/" \
-e "s/%SERVICE_PASSWORD%/$ADMIN_PASSWORD/" \ -e "s/%SERVICE_PASSWORD%/$ADMIN_PASSWORD/" \
$CONF.orig > $CONF $CONF.orig > $CONF
echo "Giving quantum user passwordless sudo privileges"
# UEC images ``/etc/sudoers`` does not have a ``#includedir``, add one
grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
echo "#includedir /etc/sudoers.d" >> /etc/sudoers
( umask 226 && echo "quantum ALL=(ALL) NOPASSWD:ALL" \
> /etc/sudoers.d/quantum_sudoers )
cd /etc/init.d/; for i in $( ls quantum-* ); do sudo service $i restart; done cd /etc/init.d/; for i in $( ls quantum-* ); do sudo service $i restart; done
sleep 1.5 sleep 1.5
...@@ -348,6 +368,8 @@ cgroup_device_acl = [ ...@@ -348,6 +368,8 @@ cgroup_device_acl = [
] ]
EOF EOF
service dbus restart && service libvirt-bin restart
sleep 1.5
virsh net-destroy default virsh net-destroy default
virsh net-undefine default virsh net-undefine default
...@@ -599,7 +621,7 @@ quantum l3-agent-router-add $L3_AGENT_ID router_$PROJECT ...@@ -599,7 +621,7 @@ quantum l3-agent-router-add $L3_AGENT_ID router_$PROJECT
quantum router-interface-add $ROUTER_ID $SUBNET_ID quantum router-interface-add $ROUTER_ID $SUBNET_ID
cd /etc/init.d/; for i in $( ls quantum-* ); do sudo service $i restart; done cd /etc/init.d/; for i in $( ls quantum-* ); do sudo service $i restart; done
sleep 2 sleep 8
cd $CURRENT_DIR cd $CURRENT_DIR
chmod +x network.py chmod +x network.py
EXT_NET_ID=$(get_id quantum net-create --tenant-id $ADMIN_ROLE ext_net --router:external=True) EXT_NET_ID=$(get_id quantum net-create --tenant-id $ADMIN_ROLE ext_net --router:external=True)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment