Merge into trunk : maas : Code : juju-quickstart

Status:	Merged
Merged at revision:	100
Proposed branch:	lp://qastaging/~frankban/juju-quickstart/maas
Merge into:	lp://qastaging/juju-quickstart
Diff against target:	107 lines (+54/-3) 4 files modified quickstart/__init__.py (+1/-1) quickstart/models/envs.py (+37/-0) quickstart/settings.py (+2/-2) quickstart/tests/models/test_envs.py (+14/-0)
To merge this branch:	bzr merge lp://qastaging/~frankban/juju-quickstart/maas
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju GUI Hackers		2014-10-01	Pending
Review via email: mp+236713@code.qastaging.launchpad.net

Description of the change

Add MAAS support to quickstart.

Also bump version up and update tge default
Juju GUI charm URLs used when charmworld cannot
be contacted.

Tests: `make check`.

QA: already done on a live MAAS instance.
However, it is possible to just try to create
a MAAS environment YAML via the interactive
session.

https://codereview.appspot.com/151200043/

Revision history for this message

Francesco Banconi (frankban) wrote on 2014-10-01:

#

Download full text (5.5 KiB)

Reviewers: mp+236713_code.launchpad.net,

Message:
Please take a look.

Description:
Add MAAS support to quickstart.

Also bump version up and update tge default
Juju GUI charm URLs used when charmworld cannot
be contacted.

Tests: `make check`.

QA: already done on a live MAAS instance.
However, it is possible to just try to create
a MAAS environment YAML via the interactive
session.

https://code.launchpad.net/~frankban/juju-quickstart/maas/+merge/236713

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/151200043/

Affected files (+55, -3 lines):
   A [revision details]
   M quickstart/__init__.py
   M quickstart/models/envs.py
   M quickstart/settings.py
   M quickstart/tests/models/test_envs.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Index: quickstart/__init__.py
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2014-09-11 11:50:53 +0000
+++ quickstart/__init__.py 2014-10-01 13:43:17 +0000
@@ -45,7 +45,7 @@
  Once Juju has been installed, the command can also be run as a juju plugin,
  without the hyphen ("juju quickstart").
  """
-VERSION = (1, 4, 3)
+VERSION = (1, 4, 4)

def get_version():

Index: quickstart/settings.py
=== modified file 'quickstart/settings.py'
--- quickstart/settings.py 2014-09-01 14:44:39 +0000
+++ quickstart/settings.py 2014-10-01 13:43:17 +0000
@@ -38,8 +38,8 @@
  # temporary connection/charmworld errors.
  # Keep this list sorted by release date (older first).
  DEFAULT_CHARM_URLS = collections.OrderedDict((
- ('precise', 'cs:precise/juju-gui-90'),
- ('trusty', 'cs:trusty/juju-gui-2'),
+ ('precise', 'cs:precise/juju-gui-97'),
+ ('trusty', 'cs:trusty/juju-gui-9'),
  ))

# The quickstart app short description.

Index: quickstart/models/envs.py
=== modified file 'quickstart/models/envs.py'
--- quickstart/models/envs.py 2014-08-21 16:23:26 +0000
+++ quickstart/models/envs.py 2014-10-01 13:43:17 +0000
@@ -653,6 +653,42 @@
              is_default_field,
          ),
      }
+ env_type_db['maas'] = {
+ 'label': 'MAAS (bare metal)',
+ 'description': (
+ '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. '
+ 'See https://juju.ubuntu.com/docs/config-maas.html and '
+ 'http://maas.ubuntu.com/ for more information about MAAS.'
+ ),
+ 'fields': (
+ provider_field,
+ name_field,
+ fields.StringField(
+ 'maa...

Reviewers: mp+236713_code.launchpad.net,

Message:
Please take a look.

Description:
Add MAAS support to quickstart.

Also bump version up and update tge default
Juju GUI charm URLs used when charmworld cannot
be contacted.

Tests: `make check`.

QA: already done on a live MAAS instance.
However, it is possible to just try to create
a MAAS environment YAML via the interactive
session.

https://code.launchpad.net/~frankban/juju-quickstart/maas/+merge/236713

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/151200043/

Affected files (+55, -3 lines):
   A [revision details]
   M quickstart/__init__.py
   M quickstart/models/envs.py
   M quickstart/settings.py
   M quickstart/tests/models/test_envs.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:  
francesco.banconi@canonical.com-20140911115550-tn4d43dqn88xiji8
+New revision:  
francesco.banconi@canonical.com-20141001134317-ozglgkiap8nav3y0

Index: quickstart/__init__.py
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2014-09-11 11:50:53 +0000
+++ quickstart/__init__.py	2014-10-01 13:43:17 +0000
@@ -45,7 +45,7 @@
  Once Juju has been installed, the command can also be run as a juju plugin,
  without the hyphen ("juju quickstart").
  """
-VERSION = (1, 4, 3)
+VERSION = (1, 4, 4)

def get_version():

Index: quickstart/settings.py
=== modified file 'quickstart/settings.py'
--- quickstart/settings.py	2014-09-01 14:44:39 +0000
+++ quickstart/settings.py	2014-10-01 13:43:17 +0000
@@ -38,8 +38,8 @@
  # temporary connection/charmworld errors.
  # Keep this list sorted by release date (older first).
  DEFAULT_CHARM_URLS = collections.OrderedDict((
-    ('precise', 'cs:precise/juju-gui-90'),
-    ('trusty', 'cs:trusty/juju-gui-2'),
+    ('precise', 'cs:precise/juju-gui-97'),
+    ('trusty', 'cs:trusty/juju-gui-9'),
  ))

# The quickstart app short description.

Index: quickstart/models/envs.py
=== modified file 'quickstart/models/envs.py'
--- quickstart/models/envs.py	2014-08-21 16:23:26 +0000
+++ quickstart/models/envs.py	2014-10-01 13:43:17 +0000
@@ -653,6 +653,42 @@
              is_default_field,
          ),
      }
+    env_type_db['maas'] = {
+        'label': 'MAAS (bare metal)',
+        'description': (
+            '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. '
+            'See https://juju.ubuntu.com/docs/config-maas.html and '
+            'http://maas.ubuntu.com/ for more information about MAAS.'
+        ),
+        'fields': (
+            provider_field,
+            name_field,
+            fields.StringField(
+                'maas-server', label='server address', required=True,
+                help='The MAAS server address, for instance '
+                     'http://<my-maas-server>/MAAS.'),
+            fields.PasswordField(
+                'maas-oauth', label='API key', required=True,
+                help='The MAAS API key. This can be found by going to the '
+                     'MAAS preferences page. A link to the preferences is '
+                     'accessible from the drop-down menu that appears  
when '
+                     'clicking your user name at the top-right of the  
page.'),
+            fields.FilePathField(
+                'authorized-keys-path', required=False,
+                label='SSH public key file',
+                help='If keys are specified, MAAS will be able to '
+                     'automatically add them to each unit it manages.'),
+            admin_secret_field,
+            default_series_field,
+            is_default_field,
+        ),
+    }
      env_type_db['local'] = {
          'label': 'local (LXC)',
          'description': (

Index: quickstart/tests/models/test_envs.py
=== modified file 'quickstart/tests/models/test_envs.py'
--- quickstart/tests/models/test_envs.py	2014-08-01 16:28:28 +0000
+++ quickstart/tests/models/test_envs.py	2014-09-29 13:50:52 +0000
@@ -806,6 +806,19 @@
          self.assert_fields(expected, env_metadata)
          self.assert_required_fields(expected_required, env_metadata)

+    def test_maas_environment(self):
+        # The MAAS environment metadata includes the expected fields.
+        self.assertIn('maas', self.env_type_db)
+        env_metadata = self.env_type_db['maas']
+        expected = [
+            'type', 'name', 'maas-server', 'maas-oauth',
+            'authorized-keys-path', 'admin-secret', 'default-series',
+            'is-default']
+        expected_required = [
+            'type', 'name', 'maas-server', 'maas-oauth', 'is-default']
+        self.assert_fields(expected, env_metadata)
+        self.assert_required_fields(expected_required, env_metadata)
+

class TestGetSupportedEnvTypes(unittest.TestCase):

@@ -820,6 +833,7 @@
              ('openstack', 'OpenStack (or HP Public Cloud)'),
              ('azure', 'Windows Azure'),
              ('joyent', 'Joyent'),
+            ('maas', 'MAAS (bare metal)'),
              ('local', 'local (LXC)'),
          ]
          obtained_env_types = envs.get_supported_env_types(self.env_type_db)

Revision history for this message

Brad Crittenden (bac) wrote on 2014-10-01:

#

On 2014/10/01 13:48:05, frankban wrote:
> Please take a look.

LGTM. I did the minimal QA and the environments.yaml file looked sane.

Thanks!

https://codereview.appspot.com/151200043/

Revision history for this message

Richard Harding (rharding) wrote on 2014-10-01:

#

LGTM with one bit of feedback on the wording. Thanks!

https://codereview.appspot.com/151200043/diff/1/quickstart/models/envs.py
File quickstart/models/envs.py (right):

https://codereview.appspot.com/151200043/diff/1/quickstart/models/envs.py#newcode678
quickstart/models/envs.py:678: help='The MAAS API key. This can be found
by going to the '
I'd tweak this to make it clear it's the 'user preference' dialog vs the
MAAS configuration page. We might even supply a link there like
/MAAS/account/prefs/

https://codereview.appspot.com/151200043/

lp://qastaging/~frankban/juju-quickstart/maas updated on 2014-10-01

103. By Francesco Banconi on 2014-10-01: Improve MAAS API key field description.

Revision history for this message

Francesco Banconi (frankban) wrote on 2014-10-01:

#

*** Submitted:

Add MAAS support to quickstart.

Also bump version up and update tge default
Juju GUI charm URLs used when charmworld cannot
be contacted.

Tests: `make check`.

QA: already done on a live MAAS instance.
However, it is possible to just try to create
a MAAS environment YAML via the interactive
session.

R=bac, rharding
CC=
https://codereview.appspot.com/151200043

https://codereview.appspot.com/151200043/

Revision history for this message

Francesco Banconi (frankban) wrote on 2014-10-01:

#

Thanks for the reviews!

https://codereview.appspot.com/151200043/diff/1/quickstart/models/envs.py
File quickstart/models/envs.py (right):

https://codereview.appspot.com/151200043/diff/1/quickstart/models/envs.py#newcode678
quickstart/models/envs.py:678: help='The MAAS API key. This can be found
by going to the '
On 2014/10/01 14:52:14, rharding wrote:
> I'd tweak this to make it clear it's the 'user preference' dialog vs
the MAAS
> configuration page. We might even supply a link there like
/MAAS/account/prefs/

Done.

https://codereview.appspot.com/151200043/

juju-quickstart

Merge lp://qastaging/~frankban/juju-quickstart/maas into lp://qastaging/juju-quickstart

Commit message

Description of the change

Preview Diff

Subscribers