Merge lp:~jjo/juju-deployer/implement-series-cli-override into lp:juju-deployer

[JuanJo Ciarlante]

[jjo,r=] implement --series= cli override

TESTS ok.

[lp:~jjo/juju-deployer/implement-series-cli-override]

85. By Kapil Thangavelu on 2014-01-23

merge branch mthaddon doc-updates re inheriteance

86. By Kapil Thangavelu on 2014-01-23

merge jjo branch for offline build server testing on precise

87. By Kapil Thangavelu on 2014-01-23

merge support for JUJU_REPOSITORY, variant of jjo support-JUJU_REPOSITORY-env_var branch

88. By Martin Packman on 2014-01-23

merge gz branch for juju binary check and helpful err msg if missing

[Kapil Thangavelu (hazmat)]

lgtm, although i'd like to drop the shorthand -i and just keep long form --series.

review: Approve

[JuanJo Ciarlante (jjo)]

> lgtm, although i'd like to drop the shorthand -i and just keep long form
> --series.

Ack, done.

[Kapil Thangavelu (hazmat)]

there's something a bit strange here which the tests note as part of their workaround, namely the deployment is using the value prior to its override, which makes this feels a bit icky/nondeterministic ie. runtime value changing while being used. the cleaner way would be to override this as the deployment is being constructed in configstack.

review: Needs Fixing

[lp:~jjo/juju-deployer/implement-series-cli-override]

89. By JuanJo Ciarlante on 2014-01-23

merge jjo diff usability fixes

90. By JuanJo Ciarlante on 2014-01-23

merge branch jjo diff tests

91. By Kapil Thangavelu on 2014-01-23

merge hazmat rework error handling to use feedback object to collect sets of validation errors

92. By Brad Crittenden on 2014-01-23

merge bac parse-constraints, normalize constraints for use with api deploys

93. By JuanJo Ciarlante on 2014-01-23

implement --series cli override, also fix wiki.yaml parsing

Unmerged revisions

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2013-11-12 04:54:58 +0000
+++ deployer/action/importer.py	2014-01-23 11:46:28 +0000
@@ -64,7 +64,8 @@
 
         # Load config overrides/includes and verify rels after we can
         # validate them.
-        self.deployment.resolve(self.options.overrides or ())
+        self.deployment.resolve(self.options.overrides or (),
+                                self.options.series)
 
     def deploy_services(self):
         self.log.info("Deploying services...")

=== modified file 'deployer/cli.py'
--- deployer/cli.py	2013-12-18 09:51:54 +0000
+++ deployer/cli.py	2014-01-23 11:46:28 +0000
@@ -88,6 +88,10 @@
               'across all services.  Input as key=value.'),
         dest='overrides', default=None)
     parser.add_argument(
+        '--series', type=str,
+        help=('Override distro series in config file'),
+        dest='series', default=None)
+    parser.add_argument(
         '-v', '--verbose', action='store_true', default=False,
         dest="verbose", help='Verbose output')
     parser.add_argument(

=== modified file 'deployer/deployment.py'
--- deployer/deployment.py	2013-10-31 19:19:36 +0000
+++ deployer/deployment.py	2014-01-23 11:46:28 +0000
@@ -177,19 +177,22 @@
                     continue
             charm.fetch()
 
-    def resolve(self, cli_overides=()):
+    def resolve(self, cli_overides=(), cli_series=None):
         # Once we have charms definitions available, we can do verification
         # of config options.
-        self.load_overrides(cli_overides)
+        self.load_overrides(cli_overides, cli_series)
         self.resolve_config()
         self.validate_relations()
         self.validate_placement()
 
-    def load_overrides(self, cli_overrides=()):
+    def load_overrides(self, cli_overrides=(), cli_series=None):
         """Load overrides."""
         overrides = {}
         overrides.update(self.data.get('overrides', {}))
 
+        if cli_series:
+            self.data['series'] = cli_series
+
         for o in cli_overrides:
             key, value = o.split('=', 1)
             overrides[key] = value

=== modified file 'deployer/tests/test_deployment.py'
--- deployer/tests/test_deployment.py	2014-01-23 09:50:55 +0000
+++ deployer/tests/test_deployment.py	2014-01-23 11:46:28 +0000
@@ -43,9 +43,17 @@
         d.fetch_charms()
 
         # Load up overrides and resolves
-        d.load_overrides(["key=abc"])
+        # kludge: because this test actually expects series' charms
+        #         to be downloadable, override it (back) to 'precise' by
+        #         previously patching it to some other value.
+        d.data['series'] = 'zeriez'
+        self.assertEqual(d.series, 'zeriez')
+
+        d.load_overrides(["key=abc"], 'precise')
         d.resolve_config()
 
+        # Verify series override
+        self.assertEqual(d.series, 'precise')
         # Verify include-base64
         self.assertEqual(d.get_service('newrelic').config, {'key': 'abc'})
         self.assertEqual(

=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2014-01-23 09:50:55 +0000
+++ deployer/tests/test_guiserver.py	2014-01-23 11:46:28 +0000
@@ -225,6 +225,7 @@
             overrides=None,
             rel_wait=60,
             retry_count=0,
+            series=None,
             terminate_machines=False,
             timeout=2700,
             update_charms=False,