juju-core

Merge lp:~arosales/juju-core/provider-config-branding into lp:juju-core/docs

  1. provider-config-branding
  2. Merge into docs
Proposed by Antonio Rosales
Status: Merged
Merge reported by: Nick Veitch
Merged at revision: not available
Proposed branch: lp:~arosales/juju-core/provider-config-branding
Merge into: lp:juju-core/docs
Diff against target: 101 lines (+18/-18)
5 files modified
htmldocs/config-aws.html (+1/-1)
htmldocs/config-hpcloud.html (+3/-3)
htmldocs/config-maas.html (+2/-2)
htmldocs/navigation.html (+6/-6)
htmldocs/navigation.json (+6/-6)
To merge this branch: bzr merge lp:~arosales/juju-core/provider-config-branding
Reviewer Review Type Date Requested Status
Dimiter Naydenov (community) Approve
Review via email: mp+198340@code.launchpad.net

Description of the change

Add branding to provider specific pages, and add more detail to MAAS introduction.

To post a comment you must log in.
Revision history for this message
Dimiter Naydenov (dimitern) wrote :

9 + <h1>Configuring for Amazon Web Service</h1>
70 + <li class=" sub"><a href="config-aws.html">Amazon Web Service</a></li>
Amazon Web Services (plural)

Otherwise, looks great.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'htmldocs/config-aws.html'
2--- htmldocs/config-aws.html 2013-10-10 01:00:24 +0000
3+++ htmldocs/config-aws.html 2013-12-10 06:58:22 +0000
4@@ -71,7 +71,7 @@
5 <!--End-Preamble-->
6 <article>
7 <section id="config_aws">
8- <h1>Configuring for Amazon AWS</h1>
9+ <h1>Configuring for Amazon Web Service</h1>
10 <p>This process requires you to have an Amazon Web Services (AWS) account. If you have not signed up for one yet, it can obtained at <a href="http://aws.amazon.com">http://aws.amazon.com</a>.</p>
11 <p>You should start by generating a generic configuration file for Juju, using the command:
12 <pre class="prettyprint lang-bash">juju generate-config</pre>
13
14=== modified file 'htmldocs/config-hpcloud.html'
15--- htmldocs/config-hpcloud.html 2013-10-10 01:00:24 +0000
16+++ htmldocs/config-hpcloud.html 2013-12-10 06:58:22 +0000
17@@ -71,12 +71,12 @@
18 <!--End-Preamble-->
19 <article>
20 <section id="config_hpcloud">
21- <h1>Configuring for HPCloud</h1>
22+ <h1>Configuring for HP Public Cloud</h1>
23 <p>You should start by generating a generic configuration file for Juju, using the command:</pre>
24 <pre class="prettyprint lang-bash">juju generate-config</pre>
25 <p>This will generate a file, <strong>environments.yaml</strong>, which will live in your <strong>~/.juju/</strong> directory (and will create the directory if it doesn't already exist).
26 <p class ="note"><strong>Note:</strong> If you have an existing configuration, you can use <code>juju generate-config --show</code> to output the new config file, then copy and paste relevant areas in a text editor etc.</p>
27- <p>The essential configuration sections for HPCloud look like this:</p>
28+ <p>The essential configuration sections for HP Public Cloud look like this:</p>
29 <pre class="prettyprint lang-yaml">
30 hpcloud:
31 type: openstack
32@@ -94,7 +94,7 @@
33 <p>The items highlighted are values you will need to enter, and are explained below. You will find most of the relevant information on the <a href="https://account.hpcloud.com/account/api_keys"> HP Cloud API Keys page</a></p>
34 <ul>
35 <li>
36- <code>tenant-name:</code> For HPCloud, this is listed as the project name on the<a href="https://account.hpcloud.com/projects"> "Manage Projects" page</a>.
37+ <code>tenant-name:</code> For HP Public Cloud, this is listed as the project name on the<a href="https://account.hpcloud.com/projects"> "Manage Projects" page</a>.
38 <img src="media/getting_started-hpc-tenant.png" alt="image showing project name">
39 </li>
40 </ul>
41
42=== modified file 'htmldocs/config-maas.html'
43--- htmldocs/config-maas.html 2013-10-10 01:00:24 +0000
44+++ htmldocs/config-maas.html 2013-12-10 06:58:22 +0000
45@@ -71,8 +71,8 @@
46 <!--End-Preamble-->
47 <article>
48 <section id="config_maas">
49- <h1>Configuring for MAAS</h1>
50- <p>Metal As A Service is software which allows you to deal with physical hardware just as easily as virtual nodes. For more information about MAAS, see <a href="http://maas.ubuntu.com"> maas.ubuntu.com </a> </p>
51+ <h1>Configuring for MAAS (bare metal)</h1>
52+ <p>Metal As A Service is software which allows you to deal with physical hardware just as easily as virtual nodes. MAAS lets you treat physical servers like virtual machines in the cloud. Rather than having to manage each server individually, MAAS turns your bare metal into an elastic cloud-like resource. Specifically, MAAS allows for services to be deployed to bare metal via Juju. For more information about MAAS, see <a href="http://maas.ubuntu.com"> maas.ubuntu.com </a> </p>
53 <p>You should start by generating a generic configuration file for Juju, using the command:</p>
54 <pre class="prettyprint lang-bash">juju generate-config</pre>
55 <p>This will generate a file, <strong>environments.yaml</strong>, which will live in your <strong>~/.juju/</strong> directory (and will create the directory if it doesn't already exist).
56
57=== modified file 'htmldocs/navigation.html'
58--- htmldocs/navigation.html 2013-12-09 18:11:30 +0000
59+++ htmldocs/navigation.html 2013-12-10 06:58:22 +0000
60@@ -1,12 +1,12 @@
61 <h1>User Guide</h1>
62 <ul class="no-margin">
63 <li class=""><a href="getting-started.html">Getting Started</a></li>
64- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
65- <li class=" sub"><a href="config-azure.html">Azure Configuration</a></li>
66- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
67- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
68- <li class=" sub"><a href="config-maas.html">Bare metal Configuration</a></li>
69- <li class=" sub"><a href="config-local.html">Local Configuration</a></li>
70+ <li class=" sub"><a href="config-aws.html">Amazon Web Service</a></li>
71+ <li class=" sub"><a href="config-azure.html">Windows Azure</a></li>
72+ <li class=" sub"><a href="config-hpcloud.html">HP Public Cloud</a></li>
73+ <li class=" sub"><a href="config-openstack.html">OpenStack</a></li>
74+ <li class=" sub"><a href="config-maas.html">MAAS (bare metal)</a></li>
75+ <li class=" sub"><a href="config-local.html">Local</a></li>
76 <li class=" sub"><a href="config-manual.html">Manual Provisioning</a></li>
77 <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
78 <li class=""><a href="charms.html">Using Charms</a></li>
79
80=== modified file 'htmldocs/navigation.json'
81--- htmldocs/navigation.json 2013-12-09 18:11:30 +0000
82+++ htmldocs/navigation.json 2013-12-10 06:58:22 +0000
83@@ -3,12 +3,12 @@
84 "Getting Started": {
85 "link": "getting-started.html",
86 "children": {
87- "AWS Configuration": "config-aws.html",
88- "Azure Configuration": "config-azure.html",
89- "HP Cloud Configuration": "config-hpcloud.html",
90- "OpenStack Configuration": "config-openstack.html",
91- "Bare metal Configuration": "config-maas.html",
92- "Local Configuration": "config-local.html",
93+ "Amazon Web Services": "config-aws.html",
94+ "Windows Azure": "config-azure.html",
95+ "HP Public Cloud": "config-hpcloud.html",
96+ "OpenStack": "config-openstack.html",
97+ "MAAS (bare metal)": "config-maas.html",
98+ "Local": "config-local.html",
99 "Manual Provisioning": "config-manual.html",
100 "Testing your setup": "getting-started.html#test"
101 }

Subscribers

People subscribed via source and target branches