Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398457 )
Change subject: Miminal migration to puppet 4 Change-Id:
I23f4bb4bdca9422f291837171e45a9d1e5454a17
......................................................................
Miminal migration to puppet 4
Change-Id: I23f4bb4bdca9422f291837171e45a9d1e5454a17
---
A puppet/.gitignore
M puppet/Makefile
A puppet/Puppetfile
A puppet/Puppetfile.lock
M puppet/README
D puppet/modules/apt
D puppet/modules/datacat
D puppet/modules/elasticsearch
D puppet/modules/exim
M puppet/modules/eximconf/manifests/es.pp
M puppet/modules/eximconf/manifests/init.pp
M puppet/modules/eximconf/manifests/web1.pp
D puppet/modules/git
D puppet/modules/java
D puppet/modules/mysql
D puppet/modules/puppi
D puppet/modules/stdlib
D puppet/modules/sysctl
18 files changed, 64 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/57/398457/1
diff --git a/puppet/.gitignore b/puppet/.gitignore
new file mode 100644
index 0000000..7f8ade6
--- /dev/null
+++ b/puppet/.gitignore
@@ -0,0 +1,2 @@
+.tmp
+.librarian
diff --git a/puppet/Makefile b/puppet/Makefile
index fbf3174..675e864 100644
--- a/puppet/Makefile
+++ b/puppet/Makefile
@@ -5,10 +5,12 @@
for files in modules/*/files; do find $$files -type f |xargs -r grep -L
'file managed by puppet'; done
testpp:
- git ls-files | grep "\.pp$$" | xargs -r puppet parser validate
+ git ls-files | grep "\.pp$$" | xargs -r /opt/puppetlabs/bin/puppet
parser validate
noop:
- puppet apply --noop --verbose --show_diff --modulepath ./modules site.pp
+ librarian-puppet install --path ./vendor
+ /opt/puppetlabs/bin/puppet apply --noop --test --modulepath
'./modules:./vendor:$$basemodulepath' site.pp
apply: site.pp
- puppet apply --modulepath ./modules site.pp
+ librarian-puppet install --path ./vendor
+ /opt/puppetlabs/bin/puppet apply --modulepath
'./modules:./vendor:$$basemodulepath' site.pp
diff --git a/puppet/Puppetfile b/puppet/Puppetfile
new file mode 100644
index 0000000..5d62330
--- /dev/null
+++ b/puppet/Puppetfile
@@ -0,0 +1,5 @@
+forge "https://forgeapi.puppetlabs.com";
+
+mod 'puppetlabs-mysql', '5.1.0'
+mod 'elastic-elasticsearch', '5.1.1'
+mod 'thias-sysctl', '1.0.6'
diff --git a/puppet/Puppetfile.lock b/puppet/Puppetfile.lock
new file mode 100644
index 0000000..ac40070
--- /dev/null
+++ b/puppet/Puppetfile.lock
@@ -0,0 +1,33 @@
+FORGE
+ remote: https://forgeapi.puppetlabs.com
+ specs:
+ elastic-elasticsearch (5.1.1)
+ puppet-yum (>= 0.9.6)
+ puppetlabs-apt (< 3.0.0, >= 2.0.0)
+ puppetlabs-java (< 2.0.0, >= 1.0.0)
+ puppetlabs-stdlib (< 5.0.0, >= 4.6.0)
+ richardc-datacat (< 1.0.0, >= 0.6.2)
+ puppet-staging (2.2.0)
+ puppet-yum (2.1.0)
+ puppetlabs-concat (< 5.0.0, >= 1.2.5)
+ puppetlabs-stdlib (< 5.0.0, >= 4.10.0)
+ puppetlabs-apt (2.4.0)
+ puppetlabs-stdlib (< 5.0.0, >= 4.13.0)
+ puppetlabs-concat (4.1.1)
+ puppetlabs-stdlib (< 5.0.0, >= 4.13.1)
+ puppetlabs-java (1.6.0)
+ puppetlabs-stdlib (< 5.0.0, >= 2.4.0)
+ puppetlabs-mysql (5.1.0)
+ puppet-staging (< 3.0.0, >= 1.0.1)
+ puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
+ puppetlabs-translate (< 2.0.0, >= 1.0.0)
+ puppetlabs-stdlib (4.24.0)
+ puppetlabs-translate (1.1.0)
+ richardc-datacat (0.6.2)
+ thias-sysctl (1.0.6)
+
+DEPENDENCIES
+ elastic-elasticsearch (= 5.1.1)
+ puppetlabs-mysql (= 5.1.0)
+ thias-sysctl (= 1.0.6)
+
diff --git a/puppet/README b/puppet/README
index cc9c052..5d37651 100644
--- a/puppet/README
+++ b/puppet/README
@@ -4,7 +4,10 @@
apt-get update
apt-get dist-upgrade
-apt-get install -y git puppet make
+wget https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb
+dpkg -i puppetlabs-release-pc1-xenial.deb
+apt-get install -y git puppet-agent make
+gem install librarian-puppet
cd /root
git clone https://gerrit.wikimedia.org/r/translatewiki
cd /root/translatewiki
diff --git a/puppet/modules/apt b/puppet/modules/apt
deleted file mode 160000
index f746a83..0000000
--- a/puppet/modules/apt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f746a8349af054aa4b242aa441d8a6d80e622102
diff --git a/puppet/modules/datacat b/puppet/modules/datacat
deleted file mode 160000
index 5a6114c..0000000
--- a/puppet/modules/datacat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5a6114cd41823160bdb01dad6eb0e2af85a8fa69
diff --git a/puppet/modules/elasticsearch b/puppet/modules/elasticsearch
deleted file mode 160000
index aa8c21d..0000000
--- a/puppet/modules/elasticsearch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aa8c21de803ed23386223c66cf516a4d5567dc33
diff --git a/puppet/modules/exim b/puppet/modules/exim
deleted file mode 160000
index ada0611..0000000
--- a/puppet/modules/exim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ada06114bd090f4a1999650a49326b9f52cd8a22
diff --git a/puppet/modules/eximconf/manifests/es.pp
b/puppet/modules/eximconf/manifests/es.pp
index 30613c7..7c69ae5 100644
--- a/puppet/modules/eximconf/manifests/es.pp
+++ b/puppet/modules/eximconf/manifests/es.pp
@@ -3,7 +3,8 @@
# Provides exim configuration for server es.
#
class eximconf::es {
- class { 'exim':
- source => 'puppet:///modules/eximconf/exim4.conf-es'
+ file { '/etc/exim4/update-exim4.conf.conf':
+ source => 'puppet:///modules/eximconf/exim4.conf-es',
+ notify => Service['exim4'],
}
}
diff --git a/puppet/modules/eximconf/manifests/init.pp
b/puppet/modules/eximconf/manifests/init.pp
index 5f743b1..f541a45 100644
--- a/puppet/modules/eximconf/manifests/init.pp
+++ b/puppet/modules/eximconf/manifests/init.pp
@@ -6,4 +6,13 @@
file { '/etc/mailname':
content => "translatewiki.net\n"
}
+
+ package { 'exim4':
+ ensure => present,
+ }
+
+ service { 'exim4':
+ ensure => running,
+ enable => true,
+ }
}
diff --git a/puppet/modules/eximconf/manifests/web1.pp
b/puppet/modules/eximconf/manifests/web1.pp
index 73d9418..f1e29b8 100644
--- a/puppet/modules/eximconf/manifests/web1.pp
+++ b/puppet/modules/eximconf/manifests/web1.pp
@@ -3,7 +3,8 @@
# Provides exim configuration for server web1.
#
class eximconf::web1 {
- class { 'exim':
- source => 'puppet:///modules/eximconf/exim4.conf-web1'
+ file { '/etc/exim4/update-exim4.conf.conf':
+ source => 'puppet:///modules/eximconf/exim4.conf-web1',
+ notify => Service['exim4'],
}
}
diff --git a/puppet/modules/git b/puppet/modules/git
deleted file mode 160000
index cfbf74d..0000000
--- a/puppet/modules/git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cfbf74dbb370f00d1349d8589ba0d963d5d503eb
diff --git a/puppet/modules/java b/puppet/modules/java
deleted file mode 160000
index 72a801c..0000000
--- a/puppet/modules/java
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72a801c1e9f1c583a9a8f1f73dc9ff54860d47ea
diff --git a/puppet/modules/mysql b/puppet/modules/mysql
deleted file mode 160000
index 11afc2b..0000000
--- a/puppet/modules/mysql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 11afc2b7965d491abcc8e8aad31d70fbc82e0b3d
diff --git a/puppet/modules/puppi b/puppet/modules/puppi
deleted file mode 160000
index ca43136..0000000
--- a/puppet/modules/puppi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca43136f039b06a1b69bd58698bba40cb4590953
diff --git a/puppet/modules/stdlib b/puppet/modules/stdlib
deleted file mode 160000
index a1c380f..0000000
--- a/puppet/modules/stdlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a1c380f403d110b6c06669cc7cd49f3a3c2a258d
diff --git a/puppet/modules/sysctl b/puppet/modules/sysctl
deleted file mode 160000
index fadc668..0000000
--- a/puppet/modules/sysctl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fadc66807c90686b31de6009a92e32156b0d2d77
--
To view, visit https://gerrit.wikimedia.org/r/398457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23f4bb4bdca9422f291837171e45a9d1e5454a17
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
