Merge lp:~tyler-baker/lava-lab/latest-minion into lp:lava-lab

Proposed by Tyler Baker
Status: Merged
Approved by: Matthew Hart
Approved revision: 300
Merged at revision: 313
Proposed branch: lp:~tyler-baker/lava-lab/latest-minion
Merge into: lp:lava-lab
Diff against target: 27 lines (+5/-0)
2 files modified
salt-minion/init.sls (+3/-0)
top.sls (+2/-0)
To merge this branch: bzr merge lp:~tyler-baker/lava-lab/latest-minion
Reviewer Review Type Date Requested Status
Matthew Hart Approve
Review via email: mp+183785@code.launchpad.net

Description of the change

Currently we have mismatched versions scattered throughout the lab. Lets keeps the salt-minion version in sync across all salt nodes. Since our dispatcher nodes are all running Ubuntu 12.04 this should be possible.

For instance, after testing this change on my lab: (Ubuntu 12.04 machines)

root@vps-1140700-17880:/srv/salt# salt '*' cmd.run 'dpkg-query --show salt-minion'
vps-1140700-17880.manage.myhosting.com:
    salt-minion 0.16.3-1precise
lava-worker-2:
    salt-minion 0.16.3-1precise
bulldozer:
    salt-minion 0.16.3-1precise
lava-worker-1:
    salt-minion 0.16.3-1precise

We may need to remove the salt-minion we have installed on the dispatchers manually and upgrade with salt.

To post a comment you must log in.
Revision history for this message
Matthew Hart (matthew-hart) wrote :

Looks good. I'm doing a nagios check to check they are all the same version so we're double covered.

review: Approve
Revision history for this message
Matthew Hart (matthew-hart) wrote :

Lets hold off on doing this until we upgrade the salt master on gateway. I'm sure the minion version was held low because there was some weird conflicts.

I want to upgrade them all manually, then we can merge this to keep them at the latest.

Revision history for this message
Tyler Baker (tyler-baker) wrote :

My thoughts exactly. I'll wait for your ack before I merge and resalt.

On 16 September 2013 06:51, Matthew Hart <email address hidden> wrote:

> Lets hold off on doing this until we upgrade the salt master on gateway.
> I'm sure the minion version was held low because there was some weird
> conflicts.
>
> I want to upgrade them all manually, then we can merge this to keep them
> at the latest.
> --
>
> https://code.launchpad.net/~tyler-baker/lava-lab/latest-minion/+merge/183785
> You are the owner of lp:~tyler-baker/lava-lab/latest-minion.
>

--
Tyler Baker
Technical Architect, LAVA
Linaro.org | Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro
http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'salt-minion'
=== added file 'salt-minion/init.sls'
--- salt-minion/init.sls 1970-01-01 00:00:00 +0000
+++ salt-minion/init.sls 2013-09-03 23:40:10 +0000
@@ -0,0 +1,3 @@
1salt-minion:
2 pkg:
3 - latest
04
=== modified file 'top.sls'
--- top.sls 2013-09-03 18:43:13 +0000
+++ top.sls 2013-09-03 23:40:10 +0000
@@ -3,6 +3,7 @@
3 - sshd3 - sshd
4 - lp_users4 - lp_users
5 - nagios5 - nagios
6 - salt-minion
67
7 'control,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,dispatcher01,dispatcher02,hackbox,multinode,playgroundmaster,playgroundworker01,staging,staging01':8 'control,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,dispatcher01,dispatcher02,hackbox,multinode,playgroundmaster,playgroundworker01,staging,staging01':
8 - match: list9 - match: list
@@ -30,5 +31,6 @@
30 - lava.webinterface31 - lava.webinterface
3132
32 'staging*':33 'staging*':
34 - match: pcre
33 - lava.fastmodels35 - lava.fastmodels
34 - lava.staging-coordinator36 - lava.staging-coordinator

Subscribers

People subscribed via source and target branches