Merge lp:~frankban/juju-quickstart/optional-fields into lp:juju-quickstart

[Francesco Banconi]

Update provider fields.

Update the list of fields that quickstart
expects for each provider type. Also make
some OpenStack fields optional
(use-floating-ip, tenant-name and region).

Update the links to the provider documentation
(use jujucharms.com).

Update the jujubundlelib dependency to use the
latest one.

Tests: `make check`.

QA:
- check that the environment editing in the
interactive session looks good
(especially the openstack/azure environments
creation).
- use quickstart as usual
(`devenv/bin/juju-quickstart`), to start
(for instance) an ec2 or an azure environment.

https://codereview.appspot.com/234150043/

[Francesco Banconi (frankban)]

Reviewers: mp+257913_code.launchpad.net,

Message:
Please take a look.

Description:
Update provider fields.

Update the list of fields that quickstart
expects for each provider type. Also make
some OpenStack fields optional
(use-floating-ip, tenant-name and region).

Update the links to the provider documentation
(use jujucharms.com).

Update the jujubundlelib dependency to use the
latest one.

Tests: `make check`.

QA:
- check that the environment editing in the
interactive session looks good
(especially the openstack/azure environments
creation).
- use quickstart as usual
(`devenv/bin/juju-quickstart`), to start
(for instance) an ec2 or an azure environment.

https://code.launchpad.net/~frankban/juju-quickstart/optional-fields/+merge/257913

(do not edit description out of merge proposal)

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

Affected files (+75, -35 lines):
   A [revision details]
   M quickstart/cli/forms.py
   M quickstart/models/envs.py
   M quickstart/tests/models/test_envs.py
   M tox.ini

[Brad Crittenden (bac)]

I can no longer login to Reitveld.

Code looks good. QA was fine.

review: Approve (code)

[Francesco Banconi (frankban)]

*** Submitted:

Update provider fields.

Update the list of fields that quickstart
expects for each provider type. Also make
some OpenStack fields optional
(use-floating-ip, tenant-name and region).

Update the links to the provider documentation
(use jujucharms.com).

Update the jujubundlelib dependency to use the
latest one.

Tests: `make check`.

QA:
- check that the environment editing in the
interactive session looks good
(especially the openstack/azure environments
creation).
- use quickstart as usual
(`devenv/bin/juju-quickstart`), to start
(for instance) an ec2 or an azure environment.

R=
CC=
https://codereview.appspot.com/234150043

https://codereview.appspot.com/234150043/

=== modified file 'quickstart/cli/forms.py'
--- quickstart/cli/forms.py	2014-01-14 15:50:10 +0000
+++ quickstart/cli/forms.py	2015-04-30 15:41:36 +0000
@@ -168,7 +168,8 @@
         # Unset values are converted to a more convenient value for the
         # checkbox (a boolean or a mixed state if allowed by the field).
         value = MIXED if field.allow_mixed else bool(field.default)
-    label = ('highlight', field.label)
+    caption_class = 'highlight' if field.required else 'optional'
+    label = (caption_class, field.label)
     widget = urwid.CheckBox(label, state=value, has_mixed=field.allow_mixed)
     widgets = []
     if error:

=== modified file 'quickstart/models/envs.py'
--- quickstart/models/envs.py	2014-11-13 08:56:19 +0000
+++ quickstart/models/envs.py	2015-04-30 15:41:36 +0000
@@ -407,6 +407,12 @@
     is_default_field = fields.BoolField(
         'is-default', label='default', allow_mixed=False, required=True,
         help='make this the default environment')
+    image_stream_field = fields.SuggestionsStringField(
+        'image-stream', label='image stream', required=False,
+        help='A simplestreams stream to select OS images from. For example '
+             'daily or released images (or any other stream available on '
+             'simplestreams).',
+        suggestions=['released', 'daily'])
     # Define data structures used as part of the metadata below.
     ec2_regions = (
         'ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2',
@@ -432,7 +438,7 @@
         '__fallback__': {
             'description': (
                 'This provider type is not supported by quickstart. '
-                'See https://juju.ubuntu.com/docs/getting-started.html for '
+                'See https://jujucharms.com/docs/stable/getting-started for '
                 'a description of how to get started with Juju.'
             ),
             'fields': (
@@ -451,7 +457,7 @@
             '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 http://aws.amazon.com. '
-            'See https://juju.ubuntu.com/docs/config-aws.html for more '
+            'See https://jujucharms.com/docs/stable/config-aws for more '
             'details on the ec2 provider configuration.'
         ),
         'fields': (
@@ -478,6 +484,7 @@
             fields.ChoiceField(
                 'region', choices=ec2_regions, default='us-east-1',
                 label='region', required=False, help='the ec2 region to use'),
+            image_stream_field,
             admin_secret_field,
             default_series_field,
             fields.AutoGeneratedStringField(
@@ -492,8 +499,8 @@
             'The openstack provider enables you to run Juju on OpenStack '
             'private and public clouds. Use this also if you want to '
             'set up Juju on HP Public Cloud. See '
-            'https://juju.ubuntu.com/docs/config-openstack.html and '
-            'https://juju.ubuntu.com/docs/config-hpcloud.html for more '
+            'https://jujucharms.com/docs/stable/config-openstack and '
+            'https://jujucharms.com/docs/stable/config-hpcloud for more '
             'details on the openstack provider configuration.'
         ),
         'fields': (
@@ -506,25 +513,31 @@
                      'For HP Public Cloud, use the value suggested below:',
                 suggestions=['https://region-a.geo-1.identity.hpcloudsvc.com'
                              ':35357/v2.0/']),
-            fields.StringField(
-                'tenant-name', label='tenant name', required=True,
-                help='The OpenStack tenant name. For HP Public Cloud, this is '
-                     'listed as the project name on the '
-                     'https://horizon.hpcloud.com/landing/ page.'),
+            # Optional fields.
             fields.BoolField(
-                'use-floating-ip', label='use floating IP', allow_mixed=False,
-                required=True,
+                'use-floating-ip', label='use floating IP', allow_mixed=True,
+                required=False,
                 help='Specifies whether the use of a floating IP address is '
                      'required to give the nodes a public IP address. '
                      'Some installations assign public IP addresses by '
                      'default without requiring a floating IP address. '
                      'For HP Public Cloud, floating IP must be activated.'),
+            fields.BoolField(
+                'use-default-secgroup', label='use default security group',
+                allow_mixed=True, required=False,
+                help='Specifies whether new machine instances should have the '
+                     '"default" OpenStack security group assigned. It '
+                     'defaults to false.'),
+            fields.StringField(
+                'tenant-name', label='tenant name', required=False,
+                help='The OpenStack tenant name. For HP Public Cloud, this is '
+                     'listed as the project name on the '
+                     'https://horizon.hpcloud.com/landing/ page.'),
             fields.SuggestionsStringField(
-                'region', label='region', required=True,
+                'region', label='region', required=False,
                 help='The OpenStack region to use. '
                      'For HP Public Cloud, use one of the following:',
                 suggestions=hp_regions),
-            # Optional fields.
             fields.ChoiceField(
                 'auth-mode', label='authentication mode', required=False,
                 default='userpass', choices=('userpass', 'keypair'),
@@ -548,6 +561,19 @@
             fields.PasswordField(
                 'secret-key', label='secret key', required=False,
                 help='the secret key to use for the keypair authentication'),
+            fields.StringField(
+                'tools-metadata-url', label='tools metadata URL',
+                required=False,
+                help='The location of the Juju tools and metadata. It '
+                     'defaults to the global public tools metadata location '
+                     'https://streams.canonical.com/tools'),
+            fields.StringField(
+                'image-metadata-url', label='image metadata URL',
+                required=False,
+                help='The location of Ubuntu cloud image metadata. It '
+                     'defaults to the global public image metadata location '
+                     'https://cloud-images.ubuntu.com/releases'),
+            image_stream_field,
             fields.AutoGeneratedStringField(
                 'control-bucket', label='control bucket', required=False,
                 help='the globally unique swift bucket name'),
@@ -563,7 +589,7 @@
             'It requires you to have an Windows Azure account. If you have '
             'not signed up for one yet, it can obtained at '
             'http://www.windowsazure.com/. See '
-            'https://juju.ubuntu.com/docs/config-azure.html for more '
+            'https://jujucharms.com/docs/stable/config-azure for more '
             'details on the azure provider configuration.'
         ),
         'fields': (
@@ -594,6 +620,7 @@
                 'location', choices=azure_locations, label='location',
                 required=True, help='the region to use'),
             # Optional fields.
+            image_stream_field,
             admin_secret_field,
             default_series_field,
             is_default_field,
@@ -606,8 +633,8 @@
             'This process requires you to have a Joyent account. If you have '
             'not signed up for one yet, it can obtained at '
             'http://www.joyent.com/. See '
-            'https://juju.ubuntu.com/docs/config-joyent.html for more details '
-            'on the joyent provider configuration.'
+            'https://jujucharms.com/docs/stable/config-joyent for more '
+            'details on the joyent provider configuration.'
         ),
         'fields': (
             provider_field,
@@ -666,7 +693,7 @@
             '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 '
+            'See https://jujucharms.com/docs/stable/config-maas and '
             'http://maas.ubuntu.com/ for more information about MAAS.'
         ),
         'fields': (
@@ -685,6 +712,16 @@
                      'drop-down menu that appears when clicking your user '
                      'name at the top-right of the page.'),
             # Optional fields.
+            fields.BoolField(
+                'disable-network-management',
+                label='disable Juju network management',
+                allow_mixed=True, required=False,
+                help='Enable this when MAAS is managing the bridge and '
+                     'bringing networks up and down. This tells Juju not to '
+                     'create a network bridge or to bring eth0 up and down '
+                     'during the cloud-init install phase. Juju will not make '
+                     'changes to the network configuration when its agents '
+                     'start.'),
             fields.FilePathField(
                 'authorized-keys-path', required=False,
                 label='SSH public key file',
@@ -707,7 +744,7 @@
             'options. Manual provisioning enables you to run Juju on systems '
             'that have a supported operating system installed. You will need '
             'to ensure that you have both SSH access and sudo rights. '
-            'See https://juju.ubuntu.com/docs/config-manual.html for more '
+            'See https://jujucharms.com/docs/stable/config-manual for more '
             'details on the manual provider configuration, including its '
             'caveats and limitattions.'
         ),
@@ -743,7 +780,7 @@
         'description': (
             'The LXC local provider enables you to run Juju on a single '
             'system like your local computer or a single server. '
-            'See https://juju.ubuntu.com/docs/config-LXC.html for more '
+            'See https://jujucharms.com/docs/stable/config-LXC for more '
             'details on the local provider configuration.'
         ),
         'fields': (

=== modified file 'quickstart/tests/models/test_envs.py'
--- quickstart/tests/models/test_envs.py	2015-02-09 10:38:25 +0000
+++ quickstart/tests/models/test_envs.py	2015-04-30 15:41:36 +0000
@@ -712,7 +712,8 @@
         env_metadata = self.env_type_db['ec2']
         expected = [
             'type', 'name', 'access-key', 'secret-key', 'region',
-            'admin-secret', 'default-series', 'control-bucket', 'is-default']
+            'image-stream', 'admin-secret', 'default-series', 'control-bucket',
+            'is-default']
         expected_required = [
             'type', 'name', 'access-key', 'secret-key',
             'is-default']
@@ -724,13 +725,12 @@
         self.assertIn('openstack', self.env_type_db)
         env_metadata = self.env_type_db['openstack']
         expected = [
-            'type', 'name', 'auth-url', 'tenant-name', 'use-floating-ip',
-            'region', 'auth-mode', 'username', 'password', 'access-key',
-            'secret-key', 'control-bucket', 'admin-secret', 'default-series',
-            'is-default']
-        expected_required = [
-            'type', 'name', 'auth-url', 'tenant-name', 'use-floating-ip',
-            'region', 'is-default']
+            'type', 'name', 'auth-url', 'use-floating-ip',
+            'use-default-secgroup', 'tenant-name', 'region', 'auth-mode',
+            'username', 'password', 'access-key', 'secret-key',
+            'tools-metadata-url', 'image-metadata-url', 'image-stream',
+            'control-bucket', 'admin-secret', 'default-series', 'is-default']
+        expected_required = ['type', 'name', 'auth-url', 'is-default']
         self.assert_fields(expected, env_metadata)
         self.assert_required_fields(expected_required, env_metadata)
 
@@ -741,7 +741,7 @@
         expected = [
             'type', 'name', 'management-subscription-id',
             'management-certificate-path', 'storage-account-name', 'location',
-            'admin-secret', 'default-series', 'is-default']
+            'image-stream', 'admin-secret', 'default-series', 'is-default']
         expected_required = [
             'type', 'name', 'management-subscription-id',
             'management-certificate-path', 'storage-account-name', 'location',
@@ -769,8 +769,8 @@
         env_metadata = self.env_type_db['maas']
         expected = [
             'type', 'name', 'maas-server', 'maas-oauth',
-            'authorized-keys-path', 'admin-secret', 'default-series',
-            'is-default']
+            'disable-network-management', '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)

=== modified file 'tox.ini'
--- tox.ini	2015-04-28 15:25:14 +0000
+++ tox.ini	2015-04-30 15:41:36 +0000
@@ -72,7 +72,7 @@
     # See https://launchpad.net/~juju/+archive/ubuntu/stable.
     websocket-client==0.18.0
     jujuclient==0.50.1
-    jujubundlelib==0.1.5
+    jujubundlelib==0.1.6
     urwid==1.2.1
     # The distribution PyYAML requirement is used in this case.
 
@@ -82,7 +82,7 @@
     # Ubuntu 14.04 (trusty) distro dependencies.
     websocket-client==0.12.0
     jujuclient==0.17.5
-    jujubundlelib==0.1.5
+    jujubundlelib==0.1.6
     PyYAML==3.10
     urwid==1.1.1
 
@@ -92,7 +92,7 @@
     # Ubuntu 14.10 (utopic) distro dependencies.
     websocket-client==0.12.0
     jujuclient==0.17.5
-    jujubundlelib==0.1.5
+    jujubundlelib==0.1.6
     PyYAML==3.11
     urwid==1.2.1
 
@@ -102,7 +102,7 @@
     # Ubuntu 15.04 (vivid) distro dependencies.
     websocket-client==0.18.0
     jujuclient==0.18.5
-    jujubundlelib==0.1.5
+    jujubundlelib==0.1.6
     PyYAML==3.11
     urwid==1.2.1