Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 22 files changed
  • 0 commit comments
  • 2 contributors
Commits on Aug 02, 2011
@labisso labisso Revert "adding documentation to describe the new template system."
This reverts commit b9585ec.

We forgot to branch off 2.7 docs before adding 2.8 doc info. Fixing
this branching 2.7 docs and reverting a few 2.8 specific commits.
a9d709a
@labisso labisso Revert "Moved these more esoteric scripts to their own subdirectory"
This reverts commit 62dcf64.

We forgot to branch off 2.7 docs before adding 2.8 doc info. Fixing
this by branching 2.7 docs and reverting a few 2.8 specific commits.
1b24c96
Commits on Aug 04, 2011
@labisso labisso Added Xen vs. KVM notes to Z2C final-tests page 07864f1
Commits on Feb 27, 2013
@priteau priteau Mark 2.7 documentation as deprecated 16148ab
View
2  cloud-client/README.txt
@@ -34,7 +34,7 @@ This will do the following:
6) Set up that directory as GLOBUS_LOCATION for the next step
- 7) Call the "../scripts/gt/clients-only-build-and-install.sh" script in the Nimbus source tree.
+ 7) Call the "../bin/clients-only-build-and-install.sh" script in the Nimbus source tree.
Since the embedded Globus directory is set up as GLOBUS_LOCATION, it will install the
client libraries there.
View
2  cloud-client/builder/environment.sh
@@ -35,7 +35,7 @@ export GLOBUS_LOCATION="$CLCLBUILDER_DIST_DIRECTORY/lib/globus"
# #########################################################
-export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../scripts/gt/clients-only-build-and-install.sh"
+export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../scripts/clients-only-build-and-install.sh"
# #########################################################
View
2  docs/m4/worksp.lib.m4
@@ -29,7 +29,7 @@ m4_define([[[_NIMBUS_TP2_2_DEPRECATED',<h3><font color="red"><b>Warning</b>: Thi
m4_define([[[_NIMBUS_2_3_DEPRECATED',<h3><font color="red"><b>Warning</b>: This document describes an old release. Check <a href="_NIMBUS_WEBSITE/docs/">here</a> for the current version.</font></h3>)m4_dnl
m4_define([[[_NIMBUS_2_4_DEPRECATED',<h3><font color="red"><b>Warning</b>: This document describes an old release. Check <a href="_NIMBUS_WEBSITE/docs/">here</a> for the current version.</font></h3>)m4_dnl
m4_define([[[_NIMBUS_2_5_DEPRECATED',<h3><font color="red"><b>Warning</b>: This document describes an old release. Check <a href="_NIMBUS_WEBSITE/docs/">here</a> for the current version.</font></h3>)m4_dnl
-m4_define([[[_NIMBUS_IS_DEPRECATED',<!-- current release -->)m4_dnl
+m4_define([[[_NIMBUS_IS_DEPRECATED',<h3><font color="red"><b>Warning</b>: This document describes an old release. Check <a href="_NIMBUS_WEBSITE/docs/">here</a> for the current version.</font></h3>)m4_dnl
m4_dnl
m4_define([[[_WORKSP_DA_DEPRECATED',
<div style="border:2px solid #000000;">
View
27 docs/src/admin/reference.html
@@ -164,11 +164,6 @@
<a href="#backfill-and-spot-instances">Backfill and spot instances</a>
</p>
</li>
- <li>
- <p>
- <a href="#libvirttemplate">libvirt template and virtio</a>
- </p>
- </li>
@@ -1858,7 +1853,7 @@
<p>
If you want to install the broker separately from Nimbus, download the
Nimbus source tarball, extract it, and run
- <i>scripts/gt/broker-build-and-install.sh</i> with an appropriate
+ <i>scripts/broker-build-and-install.sh</i> with an appropriate
<b>$GLOBUS_LOCATION</b> set.
</p>
<p>
@@ -2346,26 +2341,6 @@
then start the service and the backfill configuration will recalibrate.
</p>
-<a href="#libvirttemplate">libvirt template and virtio</a>
-<a name="libvirttemplate"> </a>
-<h2>libvirt template and virtio</h2>
-<p>
-The submission of VMs to the hypervisor (with Xen or KVM) is done by Nimbus
-via libvirt. Then submitting to libvirt the VM run request is described
-in an xml file. This file has many potential customizations depending on
-the feature set supported by a particular VMM. Many of the values are
-dynamically determined by Nimbus, however a site admin may want to add their
-own custom optimizations.
-</p>
-<p>
-The xml used for every VM submission is generated from a template found
-in the workspace control installation at:
-<tt class="literal">
-/etc/workspace-control/libvirt_template.xml
-</tt>
-Admins can add site specific optimizations (like virtio) to this template.
-</p>
-
<br />
<br />
<br />
View
66 docs/src/admin/z2c/final-tests.html
@@ -48,23 +48,37 @@
</p>
<h3>Upload image</h3>
-<p>It is recommended to start with the
- <tt class="literal">nimbus-z2c</tt> image that you used earlier to
- test the VMM. If you don't still have it, fetch it again.
+<p>It is recommended to start with the image that you used earlier to test the VMM.
+ If you don't still have it, fetch it again. Remember that there is a different
+ sample image for Xen vs. KVM.
</p>
+
+<div class="xenpanel">
<div class="panel"><pre>
$ wget http://www.nimbusproject.org/downloads/nimbus-z2c.gz
$ gunzip nimbus-z2c.gz
</pre></div>
+</div>
+
+<div class="kvmpanel">
+<div class="panel"><pre>
+$ wget http://www.nimbusproject.org/downloads/ubuntu10.10.gz
+$ gunzip ubuntu10.10.gz
+</pre></div>
+</div>
+
<p>
Now use the cloud-client to upload the VM image to the Cumulus repository.
+ For the following commands, replace <tt class="literal"><b><em>image</em></b></tt>
+ with the name of the image file you just unzipped. So <tt class="literal">nimbus-z2c</tt>
+ or <tt class="literal">ubuntu10.10</tt>.
</p>
<pre class="panel">
-$ ./bin/cloud-client.sh --transfer --sourcefile nimbus-z2c
+$ ./bin/cloud-client.sh --transfer --sourcefile <b><em>image</em></b>
Transferring
- - Source: nimbus-z2c
- - Destination: cumulus://Repo/VMS/04NjWi75iz1TzNf4Y3zvU/nimbus-z2c
+ - Source: <em>image</em>
+ - Destination: cumulus://Repo/VMS/04NjWi75iz1TzNf4Y3zvU/<em>image</em>
</pre>
<p>
@@ -74,16 +88,35 @@
<pre class="panel">
$ ./bin/cloud-client.sh --list
-[Image] 'nimbus-z2c' Read/write
+[Image] '<em>image</em>' Read/write
Modified: Jun 7 2010 @ 12:43 Size: 288358400 bytes (~275 MB)
</pre>
<h3>Start VM</h3>
+<div class="kvmpanel">
+ <p>
+ For KVM you need to make an additional configuration change to the
+ <tt class="literal">cloud.properties</tt> file. You must tell Nimbus to
+ treat the image as a disk, not just a single partition. Add the following
+ line to <tt class="literal">conf/cloud.properties</tt>:
+ </p>
+ <pre class="panel">
+ vws.metadata.mountAs=hda
+ </pre>
+
+ <p>
+ Once you have everything working, you should also add this (along with any
+ other customizations) to the cloud properties template file used for new
+ users. It is located in the service installation at
+ <tt class="literal">$NIMBUS_HOME/var/cloud.properties.in</tt>.
+ </p>
+</div>
+
<p>
Now we are ready to boot this image and see if we can ssh into it.
</p>
<pre class="panel">
-$ ./bin/cloud-client.sh --run --name nimbus-z2c --hours 1
+$ ./bin/cloud-client.sh --run --name <b><em>image</em></b> --hours 1
Launching workspace.
@@ -107,7 +140,9 @@
If all goes well, a VM should be booting and its IP should be
printed to the screen. The client will not exit until the
image is distributed and the VM is booting. When this happens,
- you can attempt to SSH into the new VM.
+ you can attempt to SSH into the new VM. SSH may not immediately
+ work because the VM may take some time to boot and start its
+ networking and daemons.
</p>
<pre class="panel">
@@ -133,11 +168,18 @@
<h3>Once more, with contextualization</h3>
+<div class="kvmpanel">
+ <p>
+ The KVM sample image does not support contextualization at this time, so you
+ can skip this step.
+ </p>
+</div>
+
<p>
The cloud client also supports launching VMs with <em>contextualization</em>.
- The VM image has an agent installed that securely contacts a broker and exchanges
- information about itself and other nodes. This allows launching groups of nodes
- that are contextualized into clusters.
+ The <tt class="literal">nimbus-z2c</tt> image has an agent installed that securely
+ contacts a broker and exchanges information about itself and other nodes. This allows
+ launching groups of nodes that are contextualized into clusters.
</p>
<div class="note">
View
2  docs/src/dev/cumulus_integration.txt
@@ -213,6 +213,6 @@ The variables are:
NOTE: If you move $NIMBUS_HOME, you need to call nimbus-configure again.
-If Nimbus is installed via ./scripts/gt/all-build-and-install.sh these
+If Nimbus is installed via ./scripts/all-build-and-install.sh these
variables will have to be manually set.
View
4 docs/src/dev/reference.html
@@ -401,7 +401,7 @@
</p>
<p>
- First run _PATH(scripts/gt/all-clean.sh).
+ First run _PATH(bin/all-clean.sh).
</p>
<p>
Then edit the "compact" WSDL in the
@@ -433,7 +433,7 @@
<p>
That creates the new wsdl. Now you need to create the auto-generated "stub"
- code Java jars. Do this by running "scripts/gt/stubs-build.sh"
+ code Java jars. Do this by running "scripts/stubs-build.sh"
</p>
<p>
View
4 install
@@ -41,9 +41,9 @@ if [ -d $NIMBUS_HOME ] && [ "$(ls -A $NIMBUS_HOME)" ]; then
echo "The destination directory '$NIMBUS_HOME' exists and is not empty."
echo "It is not recommended to reinstall Nimbus into an existing install."
echo ""
- echo "If you are making changes to the service code, you can build and install those directly:"
+ echo "If you are making changes to the services, you can build and install those directly:"
echo " export GLOBUS_LOCATION=$NIMBUS_HOME/services"
- echo " scripts/jars-build-and-install.sh"
+ echo " scripts/all-build-and-install.sh"
echo ""
echo "If you know what you are doing and want to reinstall, edit this script:"
echo " $0"
View
2  libexec/create-nimbus-home
@@ -134,7 +134,7 @@ echo "-----------------------------------------------------------------"
GLOBUS_LOCATION=$CONTAINER_DIR
export GLOBUS_LOCATION
-$NIMBUS_SRC/scripts/gt/all-build-and-install.sh
+$NIMBUS_SRC/scripts/all-build-and-install.sh
if [ $? -ne 0 ]; then
echo "Build and install FAILED!"
exit 1
View
9 scripts/gt/README.txt → scripts/README.txt
@@ -1,8 +1,9 @@
-These scripts are for building and deploying into an existing Globus
-container. Most users will want to use the ./install script, these
-scripts are for developers and also used from certain higher level
-scripts.
+_________________________________________________________________________
+Ant build and deploy scripts:
+_________________________________________________________________________
+These scripts are for building and deploying into an existing Globus
+container. Most users will want to use the ./install script.
* all-build-and-install.sh - The main installation script
* clients-only-build-and-install.sh - Main client-only installation script
View
2  scripts/gt/all-build-and-install.sh → scripts/all-build-and-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build and install all"
NIMBUS_ANT_CMD="deploy-default-GT4.0-service -Dbuild.also=x $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/all-build.sh → scripts/all-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build all"
NIMBUS_ANT_CMD="build-default-GT4.0-service $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/all-clean.sh → scripts/all-clean.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="clean all"
NIMBUS_ANT_CMD="clean-all $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/all-install.sh → scripts/all-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="install all"
NIMBUS_ANT_CMD="deploy-default-GT4.0-service $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/all-uninstall.sh → scripts/all-uninstall.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="uninstall all"
NIMBUS_ANT_CMD="undeploy-GT4.0-all $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/broker-build-and-install.sh → scripts/broker-build-and-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build and install Context Broker"
NIMBUS_ANT_CMD="deploy-broker -Dbuild.also=x $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/broker-build.sh → scripts/broker-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build Context Broker"
NIMBUS_ANT_CMD="build-broker $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/broker-install.sh → scripts/broker-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="install Context Broker"
NIMBUS_ANT_CMD="deploy-broker $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/clients-only-build-and-install.sh → scripts/clients-only-build-and-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build and install clients only"
NIMBUS_ANT_CMD="deploy-default-GT4.0-clients-only -Dbuild.also=x $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/clients-only-build.sh → scripts/clients-only-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build clients only"
NIMBUS_ANT_CMD="build-default-GT4.0-clients-only $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/clients-only-install.sh → scripts/clients-only-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="install clients only"
NIMBUS_ANT_CMD="deploy-default-GT4.0-clients-only $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2  scripts/gt/stubs-build.sh → scripts/stubs-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build all"
NIMBUS_ANT_CMD="build-stubs $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh

No commit comments for this range

Something went wrong with that request. Please try again.