Mailing List Archive

Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405806 )

Change subject: apache: rm helper_scripts class, mv script to deployment_server
......................................................................


apache: rm helper_scripts class, mv script to deployment_server

Remove the "helper_scripts" class from the apache module.

All it does is install the apache-fast-test script but that isn't actually
used in the apache module itself. Instead it is used in the
deployment_server profile, so tin/naos.

In I0142b229bfccd77cb9 i copied apache-fast-test from apache
module to the new httpd module which will replace the apache module.

Now move the file out of there as well and into profile/files/..
instead because it isn't actually for servers, it's for clients
where users run tests against servers.

Change-Id: If759d72e502401b835332d66e7d48f7b4489d8fe
---
D modules/apache/manifests/helper_scripts.pp
R modules/profile/files/mediawiki/deployment/server/apache-fast-test
M modules/profile/manifests/mediawiki/deployment/server.pp
3 files changed, 8 insertions(+), 12 deletions(-)

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



diff --git a/modules/apache/manifests/helper_scripts.pp b/modules/apache/manifests/helper_scripts.pp
deleted file mode 100644
index e613be1..0000000
--- a/modules/apache/manifests/helper_scripts.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# helper scripts for apache changes
-class apache::helper_scripts {
-
- file { '/usr/local/bin/apache-fast-test':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/apache/apache-fast-test',
- }
-
-}
diff --git a/modules/httpd/files/apache-fast-test b/modules/profile/files/mediawiki/deployment/server/apache-fast-test
similarity index 100%
rename from modules/httpd/files/apache-fast-test
rename to modules/profile/files/mediawiki/deployment/server/apache-fast-test
diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp b/modules/profile/manifests/mediawiki/deployment/server.pp
index 050ca4f..9fff686 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -28,7 +28,6 @@
}

class {'::apache': }
- class {'::apache::helper_scripts': }
class {'::mysql': }

include network::constants
@@ -116,4 +115,12 @@
# determining the state of git repos during deployments.
require_package('percona-toolkit', 'tig')
require_package('php5-readline') # bug T126262
+
+ # helper scripts for apache changes
+ file { '/usr/local/bin/apache-fast-test':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/profile/mediawiki/deployment/server/apache-fast-test',
+ }
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If759d72e502401b835332d66e7d48f7b4489d8fe
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dzahn@wikimedia.org>
Gerrit-Reviewer: Dzahn <dzahn@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavagetto@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits