Commit 23bad7d7 authored by Robert Ricci's avatar Robert Ricci

Convert to @clab-only and @apt-only

The problem with @apt-vs-clab is that my scribble-fu is not strong
enough to get the strings parsed in the @ language. If I use
@apt-only{}, then scribble takes care of it for me.
parent 9e747918
......@@ -18,20 +18,20 @@
(define (apt?) (if (equal? tb-mode 'apt) #t #f))
(define (clab?) (if (equal? tb-mode 'clab) #t #f))
(define (apt-vs-clab #:apt [apt-version ""] #:clab [clab-version ""])
(define (apt-vs-clab #:apt [apt-version (list)] #:clab [clab-version (list)])
(if (apt?)
apt-version
clab-version))
(define (apt-vs-clab* #:apt [apt-version ""] #:clab [clab-version ""])
(decode-content (list (if (apt?)
(decode-flow (list (if (apt?)
apt-version
clab-version))))
(define (apt-only stuff)
(define (apt-only . stuff)
(apt-vs-clab #:apt stuff))
(define (clab-only stuff)
(define (clab-only . stuff)
(apt-vs-clab #:clab stuff))
(define apt-base-url
......
......@@ -10,8 +10,8 @@ introduce you to some of its @seclink["basic-concepts"]{basic concepts}.
Start by pointing your browser at @url[(apturl)].
@itemlist[#:style 'ordered
@apt-vs-clab[
#:apt @instructionstep["Enter your email address and pick a username"
@apt-only{
@instructionstep["Enter your email address and pick a username"
#:screenshot "instantiate-empty.png"]{
If you don't have an account, or are not logged in, you'll be using
@(tb) as a @seclink["guest-users"]{guest user}. Guest users have some
......@@ -28,8 +28,10 @@ Start by pointing your browser at @url[(apturl)].
you upload a public key, which will enable you to use a regular
@(ssh) client.
}
@;{=================================================================}
#:clab @instructionstep["Log in"]{
}
@clab-only{
@instructionstep["Log in"]{
You'll need an account to use CloudLab. If you already have an
account on @hyperlink["http://www.emulab.net"]{Emulab.net}, you may
use that username and password. If not, you can apply to start a new
......@@ -38,7 +40,7 @@ Start by pointing your browser at @url[(apturl)].
@seclink["cloudlab-users"]{CloudLab users} for more details about
user accounts.
}
]
}
@instructionstep["Select a profile"
#:screenshot "select-profile.png"]{
......@@ -63,16 +65,15 @@ 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.
@apt-vs-clab*[
#:apt "The @tt{OneVM} profile that we've selected here will get you a
@apt-only{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
is a good place to start.}
@clab-only{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."]
physical machines.}
}
@instructionstep["Click Create!"
......@@ -85,10 +86,10 @@ Start by pointing your browser at @url[(apturl)].
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
@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!)"]
doesn't arrive in a few minutes, check your spam folder!)"}
}
@instructionstep["Use your experiment"
#:screenshot "node-list.png"]{
......@@ -127,12 +128,15 @@ Start by pointing your browser at @url[(apturl)].
@section{Next Steps}
@itemlist[
@;{@apt-only[@item{If you find @(tb) useful, @seclink["register"]{sign up} for
@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.}]
resources and lets you run longer experiments.}}
@clab-only{@item{Read the @seclink["preview-notes"]{notes on the preview
version of @(tb)}}}
@clab-only[@item{Read the @seclink["preview-notes"]{notes on the preview
version of @(tb)}}]}
@clab-only{@item{Try a profile that runs bare metal and set up a cloud stack
yourself}}
@item{Making your own profiles is easy: see the
@seclink["creating-profiles"]{chapter on profile creation} for instructions.}
......
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