Akosiaris has submitted this change and it was merged.

Change subject: Revert commits 38717f3 4f44a53
......................................................................


Revert commits 38717f3 4f44a53

These were about Hold puppetmaster version to 2.7.11-1ubuntu2.3
Turns out problem can be solved locally in the machine using apt-mark
causing no other ill effects to the rest of the fleet

Change-Id: I022eb603f2f303ffd1d626cb08bf480f29ae9539
---
M manifests/puppetmaster.pp
1 file changed, 2 insertions(+), 7 deletions(-)

Approvals:
  Akosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 44486ee..87562f6 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -27,13 +27,8 @@
        # Require /etc/puppet.conf to be in place, so the postinst scripts do 
the right things.
        require config
 
-    # TODO: 2013-09-02 latest => 2.7.11-1ubuntu2.3 due to a puppetmaster bug in
-    # 2.7.11-1ubuntu2.4. Revert it after bug is fixed
-       package { [ "puppetmaster", "puppetmaster-common",]:
-               ensure => '2.7.11-1ubuntu2.3',
-       }
-       package { [ "vim-puppet", "puppet-el", "rails", "libmysql-ruby", 
"ruby-json" ]:
-               ensure => 'latest',
+       package { [ "puppetmaster", "puppetmaster-common", "vim-puppet", 
"puppet-el", "rails", "libmysql-ruby", "ruby-json" ]:
+               ensure => latest;
        }
 
     backup::set { 'var-lib-puppet-ssl': }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I022eb603f2f303ffd1d626cb08bf480f29ae9539
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
Gerrit-Reviewer: Akosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to