From 9e747918dd692f7375b328f391429eed38f748e3 Mon Sep 17 00:00:00 2001 From: Robert Ricci Date: Mon, 8 Sep 2014 16:16:41 -0600 Subject: [PATCH] Parameterize more stuff on the getting started page Still some stuff to fix --- defs.rkt | 9 +++++++-- getting-started.scrbl | 38 +++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/defs.rkt b/defs.rkt index e9ea616..b835b4d 100644 --- a/defs.rkt +++ b/defs.rkt @@ -23,11 +23,16 @@ apt-version clab-version)) +(define (apt-vs-clab* #:apt [apt-version ""] #:clab [clab-version ""]) + (decode-content (list (if (apt?) + apt-version + clab-version)))) + (define (apt-only stuff) - (apt-vs-clab #:apt stuff #:clab "")) + (apt-vs-clab #:apt stuff)) (define (clab-only stuff) - (apt-vs-clab #:clab stuff #:apt "")) + (apt-vs-clab #:clab stuff)) (define apt-base-url (if (clab?) diff --git a/getting-started.scrbl b/getting-started.scrbl index d31f9c3..771be34 100644 --- a/getting-started.scrbl +++ b/getting-started.scrbl @@ -63,23 +63,32 @@ Start by pointing your browser at @url[(apturl)]. The large display in this dialog box shows the network topology of the profile, and a short description sits below the topology view. - The @tt{OneVM} profile that we've selected here will get you a single VM - running version 12.04 of the Ubuntu operating system---this is a good place - to start. + @apt-vs-clab*[ + #:apt "The @tt{OneVM} profile that we've selected here will get you a + single VM running version 12.04 of the Ubuntu operating system---this + is a good place to start." + #:clab "The @tt{OpenStack} profile that we've selected here will give you + a small OpenStack installation with one master node and one compute + node. It provides a simple example of how complex software stacks can + be packaged up within @(tb). If you'd prefer to start from bare metal, + look for one of the profiles that installs a stock operating sytem on + physical machines."] } + @instructionstep["Click Create!" #:screenshot "please-wait.png"]{ When you click the ``Create'' button, @(tb) will start preparing your experiment by selecting nodes, installing software, etc. as described in the profile. What's going on behind the scenes is that on one (or more) of the machines in one of the @seclink["hardware"]{@(tb) clusters}, a disk is being imaged, - a VM created and booted, accounts created for you, etc. This process usually - takes a couple of minutes. - - If you have never used this email address with @(tb) before (or if you switch - computers or browsers), @(tb) will send a verification email. Watch your - email and enter the code into @(tb) when prompted. (If it doesn't arrive in - a few minutes, check your spam folder!) + a @apt-vs-clab[#:apt "VM created and booted" #:clab "set of physical machines + booted"], accounts created for you, etc. This process usually takes a couple + of minutes. + + @apt-only["If you have never used this email address with @(tb) before (or if + you switch computers or browsers), @(tb) will send a verification email. + Watch your email and enter the code into @(tb) when prompted. (If it + doesn't arrive in a few minutes, check your spam folder!)"] } @instructionstep["Use your experiment" #:screenshot "node-list.png"]{ @@ -118,9 +127,12 @@ Start by pointing your browser at @url[(apturl)]. @section{Next Steps} @itemlist[ - @item{If you find @(tb) useful, @seclink["register"]{sign up} for an - @seclink["users"]{account}---having one gives you access to more resources - and lets you run longer experiments.} + @;{@apt-only[@item{If you find @(tb) useful, @seclink["register"]{sign up} for + an @seclink["users"]{account}---having one gives you access to more + resources and lets you run longer experiments.}] + + @clab-only[@item{Read the @seclink["preview-notes"]{notes on the preview + version of @(tb)}}]} @item{Making your own profiles is easy: see the @seclink["creating-profiles"]{chapter on profile creation} for instructions.} -- GitLab