Merge lp:~pedronis/adt-continuous-deployer/ols-tweak into lp:adt-continuous-deployer

[Samuele Pedroni]

check in tweak lying about on wendigo for ols deployments

code tweak as found on wendigo

[Celso Providelo (cprov)]

Samuele,

I have mixed feelings about generating configuration on-the-fly.

I think we have to evolve in the way we deal with *configurations* and split then in 3 groups: 'service', 'system' and 'secrets' characteristics.

The 'service' parameters influence how the service works (timeouts, database names, log filename, etc) and per immutable-services could as well be code 'constants' (changes in service aspects are recorded in the code history, not as a separate branch).

The 'system' characteristics (basically server IPs/DNS) come from a service-discovery infrastructure and don't necessarily need to be precisely tracked because changes to not impact the system (i.e. the system is prepared for changes).

Finally the 'secrets' ones, which might remain in wendigo disk and be distributed from there, because that's the only place they make sense.

That said, I don't mind you committing this now, but we could also start thinking about removing on-the-fly configs from our workflow.

review: Approve

=== modified file 'mojo.py'
--- mojo.py	2015-06-08 05:16:12 +0000
+++ mojo.py	2015-06-19 08:19:38 +0000
@@ -106,6 +106,8 @@
         filename = 'adt.conf'
     elif 'snappy-proposed' in stage:
         filename = 'snappy-proposed-service.conf'
+    elif 'ols' in stage:
+        filename = 'service.conf'
     else:
         filename = 'core-service.conf'