Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/233403

Change subject: Install wmf salt version rather than setting up the upstream 
repo.
......................................................................

Install wmf salt version rather than setting up the upstream repo.

The current state of this messes with any kind of WMF upgrade
or installing the salt master.

Bug: T110036
Change-Id: I1e659e5595e6e1854c76d9ad454c4fc54bdddb7b
---
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/233403/1

diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml 
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index dc60b6a..68f85e9 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -34,6 +34,7 @@
     - jfsutils
     - xfsprogs
     - screen
+    - salt-minion
     - gdb
     - iperf
     - htop
@@ -100,8 +101,6 @@
     metadata_sources: ConfigDrive
   puppet:
     assets: /etc/bootstrap-vz/puppet
-  salt:
-    install_source: stable
   file_copy:
     files:
       -

-- 
To view, visit https://gerrit.wikimedia.org/r/233403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e659e5595e6e1854c76d9ad454c4fc54bdddb7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to