Add promises, changes openstack fixed ip range

software/openstack/instance-compute.cfg

@@ -22,6 +22,7 @@ parts =
   nova-configure
   websockify-sighandler
   novnc-promise
+  frontend-promise
   publish-kvm-connection-information
 
 eggs-directory = ${buildout:eggs-directory}
@@ -337,6 +338,13 @@ ssh = ssh $${slap-parameter:system-user}@$${tunnel-ipv6-ssh:ipv6} -p $${tunnel-i
 ssh-defaul-passwd = $${slap-parameter:system-passwd}
 local-ipv4 = $${slap-network-information:local-ipv4}
 
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${directory:promises}/frontend_promise
+url = $${publish-kvm-connection-information:vnc-url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
 [slap-parameter]
 # Default values if not specified
 #frontend-instance-guid = SOFTINST-81

software/openstack/instance-main.cfg

@@ -13,6 +13,7 @@ parts =
   request-openstack-frontend
   nova-install
 #  openstack-frontend-promise
+  frontend-promise
   publish-kvm-connection-information
 
 eggs-directory = ${buildout:eggs-directory}
@@ -275,6 +276,15 @@ openstack-url = $${request-openstack-frontend:connection-site_url}
 openstack-vnc = $${request-openstack-vnc-frontend:connection-url}/vnc_auto.html
 openstack-services-host = $${slap-network-information:global-ipv6}
 
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${directory:promises}/frontend_promise
+url = $${publish-kvm-connection-information:vnc-url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+openstack-url = $${publish-kvm-connection-information:openstack-url}
+openstack-vnc = $${publish-kvm-connection-information:openstack-vnc}/vnc_auto.html
+
 [openstack-frontend-promise]
 recipe = slapos.cookbook:check_url_available
 path = $${directory:promises}/openstack_frontend

software/openstack/software.cfg

@@ -35,14 +35,14 @@ eggs =
 [template-openstack-main]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-main.cfg
-md5sum = 1275a60636d8970090219c34d5312be6
+md5sum = 96147d4052fac19fe9a6a72ecc1233ad
 output = ${buildout:directory}/template-openstack-main.cfg
 mode = 0644
 
 [template-openstack-compute]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-compute.cfg
-md5sum = 8201cb19c6c23e8949dfa08a7436c079
+md5sum = 77c6188255f8f469f003f2db59d1a3b4
 output = ${buildout:directory}/template-openstack-compute.cfg
 mode = 0644
 
@@ -62,7 +62,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [compute-script]
 <= template-download
 filename = configure.sh.in
-md5sum = f366e979f0cb2460f986270f8a80c236
+md5sum = 136339c0d704bb11af3839726e24c47f
 
 [compute-script-run]
 <= template-download
@@ -72,7 +72,7 @@ md5sum = e10b3796e028b65465a05b6a0c6f9762
 [openstack-install]
 <= template-download
 filename = openstack-install.sh.in
-md5sum = 31b1008ebfff9e5dadc0e18fc8f07aac
+md5sum = 1094a575e8bf577b1ed5f2ab91556b1b
 
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone

software/openstack/templates/configure.sh.in

@@ -59,6 +59,8 @@ $BRCTL_EXEC addbr br100
 #Restart the network to take  new network configuration.
 /etc/init.d/networking restart
 
+sudo apt-get update
+sudo apt-get -y upgrade
 if [ -z "$GCC_EXEC" -o ! -x "$GCC_EXEC" ]; then
   apt-get install -y gcc g++ ;
 fi

software/openstack/templates/openstack-install.sh.in

@@ -17,7 +17,8 @@ if [ -z "$IPv4" ];
   then IPv4="127.0.0.1"
 fi
 
-apt-get update
+sudo apt-get update
+sudo apt-get -y upgrade
 if [ -z "$GIT_EXEC" -o ! -x "$GIT_EXEC" ]; then
   apt-get install -y git ;
 fi
@@ -46,7 +47,7 @@ LOGDAYS=7
 
 # Nova Network Configuration
 FLAT_INTERFACE=eth0
-FIXED_RANGE=10.0.2.0/24
+FIXED_RANGE=10.0.0.0/24
 FIXED_NETWORK_SIZE=256
 FLOATING_RANGE=$FLOATING_RANGE
 
@@ -68,7 +69,7 @@ chown -R $NOVA_USER: $BASE_DIR
 
 #sudo dpkg --configure -a
 cd $BASE_DIR; ./stack.sh
-#cd $BASE_DIR; ./local.sh
+cd $BASE_DIR; ./local.sh
 
 if grep "$BASE_DIR/rejoin-stack.sh" /etc/rc.local > /dev/null
 then