Merge lp:~bac/juju-quickstart/add-gce into lp:juju-quickstart

[Brad Crittenden]

Add support for Google Compute Engine
R=evarlast, rharding

Add support for Google Compute Engine

[Brad Crittenden (bac)]

QA:

1) % make check

2) Run against GCE environment.

GCE requires you to have an account set up and a project must pre-exist before you can bootstrap with juju. Go to https://console.developers.google.com/project (be sure to login with the correct account, personal or Canonical) and set-up a project. You'll also need to go to the API setting and enable the Google Compute Engine API. Under 'Credentials', select 'Create new Client ID' which will download a JSON credentials file you will use later. Remember where you put it.

Run quickstart interactively:

(Set JUJU_HOME to be something novel if you don't want to mess up your real environments.yaml file.)

% devenv/bin/juju-quickstart -i

In the 'Create a new environment' section select Google Compute Engine and flesh it out.

Ensure the environment bootstraps and the $JUJU_HOME/environments.yaml file looks good.

[Richard Harding (rharding)]

Code is LGTM without any QA at the moment. A couple of questions though before going on.

review: Approve

[lp:~bac/juju-quickstart/add-gce]

132. By Brad Crittenden on 2015-05-05

Update Azure locations

133. By Brad Crittenden on 2015-05-05

Update EC2 regions

134. By Brad Crittenden on 2015-05-05

Updated GCE auth file description per review.

[Jay R. Wren (evarlast)]

QA with ./juju-quickstart works great with my environments.yaml which had North Central US as my azure location.

eu-central AWS works and gets passed to juju find too.

I don't have a GCE account with which to test the GCE things.

review: Approve

=== modified file 'quickstart/models/envs.py'
--- quickstart/models/envs.py	2015-04-30 14:46:42 +0000
+++ quickstart/models/envs.py	2015-05-05 14:45:54 +0000
@@ -414,15 +414,39 @@
              'simplestreams).',
         suggestions=['released', 'daily'])
     # Define data structures used as part of the metadata below.
+
+    # The up-to-date list of EC2 regions can be found at:
+    # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/
+    #   using-regions-availability-zones.html
     ec2_regions = (
         'ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2',
-        'eu-west-1', 'sa-east-1',
+        'eu-central-1', 'eu-west-1', 'sa-east-1',
         'us-east-1', 'us-west-1', 'us-west-2',
     )
     hp_regions = ('region-a.geo-1', 'region-b.geo-1')
+
+    # The Azure locations are listed at:
+    # http://azure.microsoft.com/en-us/regions/
     azure_locations = (
-        'East US', 'West US', 'West Europe', 'North Europe',
-        'Southeast Asia', 'East Asia')
+        'Central US',
+        'East US',
+        'East US 2',
+        'US Gov Iowa',
+        'US Gov Virginia',
+        'North Central US',
+        'South Central US',
+        'West US',
+        'North Europe',
+        'West Europe',
+        'East Asia',
+        'Southeast Asia',
+        'Japan East',
+        'Japan West',
+        'Brazil South',
+        'Australia East',
+        'Australia Southeast',
+    )
+
     # The first URL is used as the default one.
     joyent_sdc_urls = (
         'https://us-west-1.api.joyentcloud.com',
@@ -430,6 +454,17 @@
         'https://us-sw-1.api.joyentcloud.com',
         'https://us-ams-1.api.joyentcloud.com',
     )
+    # The first is the default.
+    gce_regions = (
+        'us-central1',
+        'europe-west1',
+        'asia-east1',
+    )
+    # The first URL is used as the default one.
+    gce_image_endpoints = (
+        'https://www.googleapis.com',
+    )
+
     # Define the env_type_db dictionary: this is done inside this function in
     # order to avoid instantiating fields at import time.
     # This is an ordered dict so that views can expose options to create new
@@ -683,6 +718,50 @@
             is_default_field,
         ),
     }
+    env_type_db['gce'] = {
+        'label': 'Google Compute Engine',
+        'description': (
+            'The gce provider enables you to run Juju on Google '
+            'Compute Engine. '
+            'This process requires you to have a Google account '
+            'and a pre-existing project.  Visit '
+            'https://console.developers.google.com/project '
+            'to set up your project and download credentials '
+            'before continuing.'),
+        'fields': (
+            provider_field,
+            name_field,
+            # SDC fields.
+            fields.StringField(
+                'project-id', required=True,
+                label='project id',
+                help='the pre-existing GCE project id. '),
+            fields.FilePathField(
+                'auth-file', required=True,
+                label='authorization file',
+                help=(
+                    'the path to the GCE project authorization '
+                    'JSON file from creating a new client id: '
+                    'https://console.developers.google.com/project/'
+                    '<project-id>/apiui/credential'),
+            ),
+            fields.ChoiceField(
+                'region', choices=gce_regions, label='region',
+                required=False, default=gce_regions[0],
+                help='the GCE region to use'),
+            fields.ChoiceField(
+                'image-endpoint', choices=gce_image_endpoints,
+                label='image endpoint',
+                required=False, default=gce_image_endpoints[0],
+                help=(
+                    'the GCE image endpoint where Juju will look '
+                    'for disk images when provisioning a '
+                    'new instance on GCE'),
+            ),
+            default_series_field,
+            is_default_field,
+        ),
+    }
     env_type_db['maas'] = {
         'label': 'MAAS (bare metal)',
         'description': (

=== modified file 'quickstart/tests/models/test_envs.py'
--- quickstart/tests/models/test_envs.py	2015-04-30 14:50:56 +0000
+++ quickstart/tests/models/test_envs.py	2015-05-05 14:45:54 +0000
@@ -763,6 +763,18 @@
         self.assert_fields(expected, env_metadata)
         self.assert_required_fields(expected_required, env_metadata)
 
+    def test_gce_environment(self):
+        # The GCE environment metadata includes the expected fields.
+        self.assertIn('gce', self.env_type_db)
+        env_metadata = self.env_type_db['gce']
+        expected = [
+            'type', 'name', 'project-id', 'auth-file', 'region',
+            'image-endpoint', 'default-series', 'is-default']
+        expected_required = [
+            'type', 'name', 'project-id', 'auth-file', 'is-default']
+        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)
@@ -802,6 +814,7 @@
             ('openstack', 'OpenStack (or HP Public Cloud)'),
             ('azure', 'Windows Azure'),
             ('joyent', 'Joyent'),
+            ('gce', 'Google Compute Engine'),
             ('maas', 'MAAS (bare metal)'),
             ('manual', 'Manual Provisioning'),
             ('local', 'local (LXC)'),