Commit 8fb8776a by David Johnson

Switch to using a specific version of protobuf-c (tag v1.2.1).

(v1.3 or HEAD seem to be broken, didn't attempt to understand why).

(Also, tweak the profile description to highlight Capnet just a little
bit; still need to fixup some demo instructions.)
parent 36991ea1
Pipeline #2177 passed with stage
in 14 seconds
......@@ -12,7 +12,7 @@ TBURL = "http://www.emulab.net/downloads/openstack-setup-v26-capnet.tar.gz"
TBCMD = "sudo mkdir -p /root/setup && sudo -H /tmp/setup/setup-driver.sh 2>&1 | sudo tee /root/setup/setup-driver.log"
EXT_TARBALLS = []
CAPNET_TBURL = "http://www.emulab.net/downloads/openstack-setup-ext-capnet-v2.tar.gz"
CAPNET_TBURL = "http://www.emulab.net/downloads/openstack-setup-ext-capnet-v9.tar.gz"
#
# Create our in-memory model of the RSpec -- the resources we're going to request
......@@ -28,9 +28,10 @@ pc = portal.Context()
#
# Define *many* parameters; see the help docs in geni-lib to learn how to modify.
#
# ,("kilo","Kilo"),("juno","Juno")],
pc.defineParameter("release","OpenStack Release",
portal.ParameterType.STRING,"liberty",[("liberty","Liberty"),("kilo","Kilo"),("juno","Juno")],
longDescription="We provide either OpenStack Liberty (Ubuntu 15.10); Kilo (Ubuntu 15.04); or Juno (Ubuntu 14.10). OpenStack is installed from packages available on these distributions.")
portal.ParameterType.STRING,"liberty",[("liberty","Liberty")],
longDescription="We provide CapNet support only for OpenStack Liberty (Ubuntu 15.10). OpenStack is installed from packages available on this distributions.")
pc.defineParameter("computeNodeCount", "Number of compute nodes (at Site 1)",
portal.ParameterType.INTEGER, 1)
pc.defineParameter("publicIPCount", "Number of public IP addresses",
......@@ -361,7 +362,7 @@ for param in pc._parameterOrder:
pass
tourDescription = \
"This profile provides a highly-configurable OpenStack instance with a controller, network manager, and one or more compute nodes (potentially at multiple Cloudlab sites). This profile runs x86 or ARM64 nodes. It sets up OpenStack Liberty, Kilo, or Juno (on Ubuntu 15.10, 15.04, or 14.10) according to your choice, and configures all OpenStack services, pulls in some VM disk images, and creates basic networks accessible via floating IPs. You'll be able to create instances and access them over the Internet in just a few minutes. When you click the Instantiate button, you'll be presented with a list of parameters that you can change to control what your OpenStack instance will look like; **carefully** read the parameter documentation on that page (or in the Instructions) to understand the various features available to you."
"This profile provides a highly-configurable, CapNet-enabled OpenStack instance with a controller, network manager, and one or more compute nodes (potentially at multiple Cloudlab sites). This profile runs x86 or ARM64 nodes. It sets up OpenStack Liberty on Ubuntu 15.10, and configures all OpenStack services, pulls in some VM disk images, and creates basic networks accessible via floating IPs. You'll be able to create instances and access them over the Internet in just a few minutes. When you click the Instantiate button, you'll be presented with a list of parameters that you can change to control what your OpenStack instance will look like; **carefully** read the parameter documentation on that page (or in the Instructions) to understand the various features available to you."
###if not params.adminPass or len(params.adminPass) == 0:
passwdHelp = "Your OpenStack admin and instance VM password is randomly-generated by Cloudlab, and it is: `{password-adminPass}` ."
......
......@@ -87,7 +87,7 @@ cd ..
# Now protobuf-c
git clone https://github.com/protobuf-c/protobuf-c.git protobuf-c
cd protobuf-c && ./autogen.sh && cd ..
cd protobuf-c && git checkout v1.2.1 && ./autogen.sh && cd ..
mkdir protobuf-c.obj && cd protobuf-c.obj
../protobuf-c/configure --prefix=/usr/local
make && make install
......
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