@@ -2,15 +2,21 @@ Title: Getting started with Juju
22
33# Getting started with Juju  
44
5- Juju works with public clouds, private clouds, MAAS, and LXD. A central Juju
6- machine, the controller, processes all of the events that occur between the
7- Juju client and the workload machines.
5+ ?????? Blurb about what Juju is ??????
6+ Juju works with public clouds, private clouds, MAAS, and LXD. 
87
9- The instructions on this page will show you how to get started with Juju by
10- using the online-hosted JAAS (Juju as a Service) controller.
8+ A central Juju machine, the controller, processes all of the events that occur
9+ between the Juju client and the workload machines. The instructions on this
10+ page will show you how to get started with Juju by using the online-hosted JAAS
11+ (Juju as a Service) controller.
1112
12- A good alternative method for learning about Juju is to use it with local LXD
13- containers. See tutorial [ Using Juju locally (LXD)] [ tutorial-lxd ] .
13+ Using JAAS does not preclude the use of the traditional command line client for
14+ managing Juju. Anything you do in JAAS is transparent to the Juju client, and
15+ vice versa. We'll provide instructions for doing so along with a crash course
16+ on client usage.
17+ 
18+ An alternative method for learning about Juju is to run it alongside LXD
19+ containers (see tutorial [ Using Juju locally (LXD)] [ tutorial-lxd ] ).
1420
1521## JAAS  
1622
3238
3339### Create a model  
3440
35- Applications are contained within * models*  and are installed via * charms* . 
36- 
41+ Applications are contained within * models*  and are installed via * charms* .
3742Create your first model by pressing the "Start building" button.
3843
3944<style >
@@ -111,8 +116,13 @@ Press the blue "Deploy changes" button to proceed.
111116</table >
112117
113118After you press "Deploy changes" you can adjust your model name. You will then
114- need to decide  which cloud you want to use .
119+ be asked  which cloud you want to apply the model towards .
115120
121+ !!! Note:
122+     Driving Juju from the command line client would require us to inform Juju
123+     about credentials at model-creation time. JAAS allows for a slight change
124+     in workflow in this respect.
125+     
116126## Adding credentials  
117127
118128After selecting a cloud, a form will appear for submitting your credentials to
@@ -257,30 +267,33 @@ on the command line.
257267Congratulations! You just deployed a workload in the cloud without hours of
258268looking up configuration options or wrestling with install scripts!
259269
260- To discover more about what Juju can do for you,  we suggest taking a look at
261- some of the  following resources:
270+ To delve into the conceptual world of Juju  we suggest taking a look at the 
271+ following resources:
262272
263-  -  [ Charms ] [ charms ] 
273+  -  [ Controllers ] [ controllers ] 
264274 -  [ Models] [ models ] 
265-  -  [ Using Juju locally (LXD)] [ tutorial-lxd ] 
266-  -  [ Multi-user cloud] [ tutorial-users ] 
275+  -  [ Client] [ client ] 
276+  -  [ Charms] [ charms ] 
277+  -  [ Concepts and terms] [ concepts ] 
267278
268279
269280<!--  LINKS --> 
270281
271282[ jaas-login ] : https://jujucharms.com/login 
272283[ ubuntu-sso ] : https://login.ubuntu.com/ 
273284[ install ] : ./reference-install.md 
274- [ models ] : ./models.md 
275- [ charms ] : ./charms.md 
276285[ charms-bundles ] : ./charms-bundles.md 
277286[ charm-store ] : https://jujucharms.com/store 
278287[ charm-cdk ] : https://jujucharms.com/canonical-kubernetes/ 
279288[ tutorial-lxd ] : ./tut-lxd.md 
280- [ tutorial-users ] : ./tut-users.md 
281289[ clouds-azure ] : ./help-azure.md 
282290[ clouds-aws ] : ./clouds-aws.md 
283291[ clouds-gce ] : ./help-google.md 
284292[ clouds-aws-creds ] : ./clouds-aws.md#credentials 
285293[ clouds-azure-creds ] : ./help-azure.md#credentials 
286294[ clouds-gce-creds ] : ./help-google.md#download-credentials 
295+ [ controllers ] : ./controllers.md 
296+ [ models ] : ./models.md 
297+ [ client ] : ./client.md 
298+ [ charms ] : ./charms.md 
299+ [ concepts ] : ./juju-concepts.md 
0 commit comments