Merge lp:~al-maisan/pyjuju/env-faq into lp:~juju/pyjuju/docs

[Muharem Hrnjadovic]

fix the indentation for some of the FAQs and adds a new FAQ about choosing between environments

This fixes the indentation for some of the FAQs and adds a new FAQ about choosing between environments.

[Kapil Thangavelu (hazmat)]

lgtm, quick notes orchestra and maas are implemented.

``juju``
76 + command accepts an ``-e`` parameter that can be used to specify the name of
77 + the desired environment.

its the subcommands that accept the -e

review: Approve

[lp:~al-maisan/pyjuju/env-faq]

12. By Muharem Hrnjadovic on 2012-04-07

Kapil's review comments

[Muharem Hrnjadovic (al-maisan)]

I have revised the FAQs in question in accordance with Kapil's review comments.

[lp:~al-maisan/pyjuju/env-faq]

13. By Muharem Hrnjadovic on 2012-04-07

minor fix

[Mark Mims (mark-mims)]

this was already merged at bzr11

=== modified file 'source/faq.rst'
--- source/faq.rst	2012-04-04 13:58:46 +0000
+++ source/faq.rst	2012-04-07 20:04:17 +0000
@@ -35,45 +35,56 @@
   No, juju uses a plain Ubuntu image. All needed components are installed
   at run-time. Then the juju charm is sent to the machine and hooks start
   getting executed in response to events. If you need a custom AMI you can
-specify it in the environments.yaml file. 
+  specify it in the environments.yaml file. 
 
 Is it possible to deploy multiple services per machine?
 
   Currently each service unit is deployed to a separate machine that can relate
-to other services running on different nodes. This was done to get juju into a
-working state faster. juju will definitely support multiple services per
-machine in the future
+  to other services running on different nodes. This was done to get juju into a
+  working state faster. juju will definitely support multiple services per
+  machine in the future
 
 Is it possible to pass parameters to juju charms?
 
   Tunables are landing very soon in juju. Once ready you will be able to use
-"juju set service key=value" and respond to that from within the juju charm.
-This will enable dynamic features to be added to charms
+  "juju set service key=value" and respond to that from within the juju charm.
+  This will enable dynamic features to be added to charms
 
 Does juju only deploy to the Amazon EC2 cloud?
 
-  No. juju can deploy to EC2, OpenStack, and bare metal via LXC containers or
-Orchestra. When using LXC you are able to run juju charms on a single local
-machine. This is the recommended method for prototyping charms as it's quicker
-to iterate locally and then deploy on the cloud when you're ready to test.
-Also integration work with the `Orchestra <https://launchpad.net/orchestra>`_
-project is underway to enable deployment to hardware machines.

+  No. juju can deploy to EC2, OpenStack, and bare metal (`MAAS
+  <https://wiki.ubuntu.com/ServerTeam/MAAS/Juju>`_) via LXC containers or
+  Orchestra .
+  When using LXC you are able to run juju charms on a single local machine.
+  This is the recommended method for prototyping charms as it's quicker to
+  iterate locally and then deploy on the cloud when you're ready to test.

 
 What directory are hooks executed in?
 
   Hooks are executed in the charm directory (the parent directory to the hook
-directory). This is primarily to encourage putting additional resources that a
-hook may use outside of the hooks directory which is the public interface of
-the charm.
+  directory). This is primarily to encourage putting additional resources that
+  a hook may use outside of the hooks directory which is the public interface
+  of the charm.
 
 How are charms licensed?
 
   Charms are effectively data inputs to juju, and are therefore
-licensed/copyrighted by the author as an independent work. You are free to
-claim copyright solely for yourself if it's an independent work, and to license
-it as you see fit. If you as the charm author are performing the work as a
-result of a fiduciary agreement, the terms of such agreement come into play and
-so the licensing choice is up to the hiring entity.
+  licensed/copyrighted by the author as an independent work. You are free to
+  claim copyright solely for yourself if it's an independent work, and to
+  license it as you see fit. If you as the charm author are performing the work
+  as a result of a fiduciary agreement, the terms of such agreement come into
+  play and so the licensing choice is up to the hiring entity.
+
+How can I choose between environments?
+
+  You can have as many environments as you want in ``environments.yaml`` and
+  set one as the default either by specifying
+
+    ``default: default-env-name``
+
+  or via a ``JUJU_ENV`` environment variable. Last but not least the ``juju``
+  subcommands accept an ``-e`` parameter that can be used to specify the name
+  of the desired environment.
 
 How can I contact the juju team?