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

[JuanJo Ciarlante]

[jjo,r=] implement --series cli override via ConfigStack initializaion,
also fix wiki.yaml parsing.

TESTS ok.

[Kapil Thangavelu (hazmat)]

lgtm, thanks

review: Approve

=== modified file 'configs/wiki.yaml'
--- configs/wiki.yaml	2013-07-12 12:52:59 +0000
+++ configs/wiki.yaml	2014-01-23 15:03:59 +0000
@@ -6,19 +6,19 @@
       branch: lp:charms/precise/mediawiki
       constraints: mem=2
       num_units: 2
-     db:
+    db:
        charm: mysql
        branch: lp:charms/precise/mysql
        options:
          tuning-level: fast
-     haproxy:
-       branch: lp:charms/precise/haproxy
-       options:
-         request-limit: 32
-     memcached:
-       branch: lp:charms/precise/memcached
-       options:
-         request-limit: 32
+    haproxy:
+      branch: lp:charms/precise/haproxy
+      options:
+        request-limit: 32
+    memcached:
+      branch: lp:charms/precise/memcached
+      options:
+        request-limit: 32
   relations:
     - ["wiki:db", mysql]
     - [wiki, [haproxy, memcached]]
 
=== modified file 'deployer/cli.py'
--- deployer/cli.py	2013-12-18 09:51:54 +0000
+++ deployer/cli.py	2014-01-23 15:03:59 +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 files'),
+        dest='series', default=None)
+    parser.add_argument(
         '-v', '--verbose', action='store_true', default=False,
         dest="verbose", help='Verbose output')
     parser.add_argument(
@@ -148,7 +152,7 @@
         sys.exit(1)
     log.debug('Using runtime %s', env.__class__.__name__)
 
-    config = ConfigStack(options.configs or [])
+    config = ConfigStack(options.configs or [], options.series)
 
     # Destroy services and exit
     if options.destroy_services or options.terminate_machines:
 
=== modified file 'deployer/config.py'
--- deployer/config.py	2014-01-23 10:37:30 +0000
+++ deployer/config.py	2014-01-23 15:03:59 +0000
@@ -16,8 +16,9 @@
 
     log = logging.getLogger("deployer.config")
 
-    def __init__(self, config_files):
+    def __init__(self, config_files, cli_series=None):
         self.config_files = config_files
+        self.cli_series = cli_series
         self.data = {}
         self.yaml = {}
         self.include_dirs = []
@@ -60,6 +61,8 @@
             raise ErrorExit()
         deploy_data = self.data[key]
         deploy_data = self._resolve_inherited(deploy_data)
+        if self.cli_series:
+            deploy_data['series'] = self.cli_series
         return Deployment(
             key, deploy_data, self.include_dirs,
             repo_path=os.environ.get("JUJU_REPOSITORY", ""))
 
=== modified file 'deployer/tests/test_config.py'
--- deployer/tests/test_config.py	2013-10-30 00:16:05 +0000
+++ deployer/tests/test_config.py	2014-01-23 15:03:59 +0000
@@ -126,6 +126,13 @@
                    ('nova-cloud-controller', 'mysql')]
         self.assertEquals(ex_rels, list(deployment.get_relations()))
 
+    def test_config_series_override(self):
+        config = ConfigStack(['configs/wiki.yaml'], 'trusty')
+        config.load()
+        result = config.get("wiki")
+        self.assertTrue(isinstance(result, Deployment))
+        self.assertEquals(result.series, 'trusty')
+
 
 class NetworkConfigFetchingTests(Base):
     """Configuration files can be specified via URL that is then fetched."""
 
=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2014-01-23 14:14:28 +0000
+++ deployer/tests/test_guiserver.py	2014-01-23 15:03:59 +0000
@@ -226,6 +226,7 @@
             overrides=None,
             rel_wait=60,
             retry_count=0,
+            series=None,
             terminate_machines=False,
             timeout=2700,
             update_charms=False,