Merge lp:~lmic/juju-deployer/juju-deployer-populate-first+add-machine-charm-series into lp:~jason-hobbs/juju-deployer/juju-deployer-populate-first

[Larry Michel]

[Jason Hobbs (jason-hobbs)]

Did you test this?

[Jason Hobbs (jason-hobbs)]

The charm url can't be used to find the charm series - sometimes we deploy trusty charms onto precise and sometimes vice-versa.

review: Needs Fixing

[Larry Michel (lmic)]

Yes. It works. I had it running all weekend.

On Mon, Jun 22, 2015 at 9:23 AM, Jason Hobbs <email address hidden>
wrote:

> Did you test this?
> --
>
> https://code.launchpad.net/~lmic/juju-deployer/juju-deployer-populate-first+add-machine-charm-series/+merge/262514
> You are the owner of
> lp:~lmic/juju-deployer/juju-deployer-populate-first+add-machine-charm-series.
>

[lp:~lmic/juju-deployer/juju-deployer-populate-first+add-machine-charm-series]

157. By Larry Michel <email address hidden> on 2015-06-23

only use charm series from url if it's win2012hvr2

[Larry Michel (lmic)]

> The charm url can't be used to find the charm series - sometimes we deploy
> trusty charms onto precise and sometimes vice-versa.

I added patch to this will only be done for win2012hvr2 series.

Unmerged revisions

157. By Larry Michel <email address hidden> on 2015-06-23

only use charm series from url if it's win2012hvr2

156. By Larry Michel <email address hidden> on 2015-06-20

acknowledge series from charm

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2015-06-11 20:53:00 +0000
+++ deployer/action/importer.py	2015-06-23 21:25:55 +0000
@@ -183,6 +183,10 @@
             charm = self.deployment.get_charm_for(svc.name)
             self.log.info(
                 " Deploying service %s using %s", svc.name, charm.charm_url)
+            
+            # The series will follow : in the url and precede /
+            url_series = (charm.charm_url.split(':')[1]).split('/')[0] 
+            charm_series = url_series if url_series is 'win2012hvr2' else None
 
             if svc.unit_placement:
                 # We sorted all the non placed services first, so we only
@@ -221,7 +225,7 @@
                 self.log.debug('Pre-allocating machines for %s' % svc.name)
                 self.log.debug('Deploy base service: %s' % svc.name)
                 p = placement.get(0)
-                machine = self.get_machine(p)
+                machine = self.get_machine(p, charm_series)
                 self.log.debug('deploy_services: '
                                'service=%s unit=0 placement=%s machine=%s' %
                                (svc.name, p, machine))
@@ -243,7 +247,7 @@
                 placement = self.deployment.get_unit_placement(svc, env_status)
                 for uid in range(cur_units, svc.num_units):
                     p = placement.get(uid)
-                    machine = self.get_machine(p)
+                    machine = self.get_machine(p, charm_series)
                     self.log.debug('add_units: '
                                    'service=%s unit=%s placement=%s machine=%s' %
                                    (svc.name, uid, p, machine))
@@ -264,7 +268,7 @@
                     svc.config,
                     svc.constraints,
                     num_units,
-                    self.get_machine(placement.get(0)))
+                    self.get_machine(placement.get(0), charm_series))
 
             if svc.annotations:
                 self.log.debug(" Setting annotations")
@@ -337,7 +341,7 @@
             int(timeout), watch=self.options.watch,
             services=self.deployment.get_service_names(), on_errors=on_errors)
 
-    def get_machine(self, u_idx):
+    def get_machine(self, u_idx, charm_series=None):
         # find the machine id that matches the target machine
         # unlike juju status output, the dns-name is one of the
         # many values returned from our env.status() in addresses
@@ -365,6 +369,10 @@
 
             # if we don't find a match, we need to add it
             series = self.deployment.data['series']
+            if (charm_series != None) and (charm_series != series):
+                # override series if different from deployment series 
+                series = charm_series
+
             mid = self.env.add_specific_machine(u_idx, series)
             self.deployment.log.debug(
                 'Waiting for machine to show up in status.')