Giuseppe Lavagetto has submitted this change and it was merged. Change subject: role::deployment: move to role module ......................................................................
role::deployment: move to role module Change-Id: I32f74d90307244a36795f143c6d7369e4cbb7966 --- R modules/role/files/deployment/umask-wikidev-profile-d.sh A modules/role/manifests/deployment/config.pp A modules/role/manifests/deployment/mediawiki.pp A modules/role/manifests/deployment/salt_masters.pp R modules/role/manifests/deployment/server.pp A modules/role/manifests/deployment/services.pp A modules/role/manifests/deployment/test.pp R modules/role/templates/deployment/apache-vhost.erb 8 files changed, 72 insertions(+), 69 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/files/deploy/umask-wikidev-profile-d.sh b/modules/role/files/deployment/umask-wikidev-profile-d.sh similarity index 100% rename from files/deploy/umask-wikidev-profile-d.sh rename to modules/role/files/deployment/umask-wikidev-profile-d.sh diff --git a/modules/role/manifests/deployment/config.pp b/modules/role/manifests/deployment/config.pp new file mode 100644 index 0000000..521037a --- /dev/null +++ b/modules/role/manifests/deployment/config.pp @@ -0,0 +1,5 @@ +# Configuration info: https://wikitech.wikimedia.org/wiki/Trebuchet#Adding_a_new_repo +# Troubleshooting: https://wikitech.wikimedia.org/wiki/Trebuchet#Troubleshooting +class role::deployment::config { + $repo_config = hiera_hash('role::deployment::repo_config') +} diff --git a/modules/role/manifests/deployment/mediawiki.pp b/modules/role/manifests/deployment/mediawiki.pp new file mode 100644 index 0000000..c129153 --- /dev/null +++ b/modules/role/manifests/deployment/mediawiki.pp @@ -0,0 +1,15 @@ +# === Class role::deployment::mediawiki +# Installs the keyholder agent for mediawiki +class role::deployment::mediawiki( + $keyholder_user = 'mwdeploy', + $keyholder_group = 'wikidev', + $key_fingerprint = 'f5:18:a3:44:77:a2:31:23:cb:7b:44:e1:4b:45:27:11', +) { + require ::keyholder + require ::keyholder::monitoring + + keyholder::agent { $keyholder_user: + trusted_group => $keyholder_group, + key_fingerprint => $key_fingerprint, + } +} diff --git a/modules/role/manifests/deployment/salt_masters.pp b/modules/role/manifests/deployment/salt_masters.pp new file mode 100644 index 0000000..2ef9264 --- /dev/null +++ b/modules/role/manifests/deployment/salt_masters.pp @@ -0,0 +1,26 @@ +# === Class role::deployment::salt_masters +# Installs deployment-related data to the salt master +class role::deployment::salt_masters( + $deployment_server = 'tin.eqiad.wmnet', +) { + + $deployment_config = { + 'parent_dir' => '/srv/deployment', + 'servers' => { + 'eqiad' => $deployment_server, + 'codfw' => $deployment_server, + }, + 'redis' => { + 'host' => $deployment_server, + 'port' => '6379', + 'db' => '0', + }, + } + + class { '::role::deployment::config': } + + class { 'deployment::salt_master': + repo_config => $role::deployment::config::repo_config, + deployment_config => $deployment_config, + } +} diff --git a/manifests/role/deployment.pp b/modules/role/manifests/deployment/server.pp similarity index 62% rename from manifests/role/deployment.pp rename to modules/role/manifests/deployment/server.pp index f666ae9..dfe5beb 100644 --- a/manifests/role/deployment.pp +++ b/modules/role/manifests/deployment/server.pp @@ -1,14 +1,8 @@ -# Configuration info: https://wikitech.wikimedia.org/wiki/Trebuchet#Adding_a_new_repo -# Troubleshooting: https://wikitech.wikimedia.org/wiki/Trebuchet#Troubleshooting -class role::deployment::config { - $repo_config = hiera_hash('role::deployment::repo_config') -} - class role::deployment::server( $apache_fqdn = $::fqdn, $deployment_group = 'wikidev', ) { - # Can't include this while scap is present on tin: + # Can't include this while scap is present on the deployment server: # include misc::deployment::scripts include role::deployment::mediawiki include role::deployment::services @@ -24,7 +18,7 @@ group => 'root', mode => '0444', # NOTE: This file is also used in role::statistics - source => 'puppet:///files/deploy/umask-wikidev-profile-d.sh', + source => 'puppet:///modules/role/deployment/umask-wikidev-profile-d.sh', } include ::apache @@ -81,7 +75,7 @@ } apache::site { 'deployment': - content => template('apache/sites/deployment.erb'), + content => template('role/deployment/apache-vhost.erb'), require => File['/srv/deployment'], } @@ -126,64 +120,4 @@ # jq is a cli program for manipulating json (from api endpoints and such) ensure_packages(['jq']) -} - -class role::deployment::salt_masters( - $deployment_server = 'tin.eqiad.wmnet', -) { - - $deployment_config = { - 'parent_dir' => '/srv/deployment', - 'servers' => { - 'eqiad' => $deployment_server, - 'codfw' => $deployment_server, - }, - 'redis' => { - 'host' => $deployment_server, - 'port' => '6379', - 'db' => '0', - }, - } - - class { '::role::deployment::config': } - - class { 'deployment::salt_master': - repo_config => $role::deployment::config::repo_config, - deployment_config => $deployment_config, - } -} - -class role::deployment::mediawiki( - $keyholder_user = 'mwdeploy', - $keyholder_group = 'wikidev', - $key_fingerprint = 'f5:18:a3:44:77:a2:31:23:cb:7b:44:e1:4b:45:27:11', -) { - require ::keyholder - require ::keyholder::monitoring - - keyholder::agent { $keyholder_user: - trusted_group => $keyholder_group, - key_fingerprint => $key_fingerprint, - } -} - -class role::deployment::services ( - $keyholder_user = 'deploy-service', - $keyholder_group = 'deploy-service', - $key_fingerprint = '6d:54:92:8b:39:10:f5:9b:84:40:36:ef:3c:9a:6d:d8', -) { - require ::keyholder - require ::keyholder::monitoring - - keyholder::agent { $keyholder_user: - trusted_group => $keyholder_group, - key_fingerprint => $key_fingerprint, - key_file => 'servicedeploy_rsa', - } -} - -class role::deployment::test { - package { 'test/testrepo': - provider => 'trebuchet', - } } diff --git a/modules/role/manifests/deployment/services.pp b/modules/role/manifests/deployment/services.pp new file mode 100644 index 0000000..cecd9ca --- /dev/null +++ b/modules/role/manifests/deployment/services.pp @@ -0,0 +1,16 @@ +# === Class role::deployment::services +# Installs the keyholder agent for deploying services +class role::deployment::services ( + $keyholder_user = 'deploy-service', + $keyholder_group = 'deploy-service', + $key_fingerprint = '6d:54:92:8b:39:10:f5:9b:84:40:36:ef:3c:9a:6d:d8', +) { + require ::keyholder + require ::keyholder::monitoring + + keyholder::agent { $keyholder_user: + trusted_group => $keyholder_group, + key_fingerprint => $key_fingerprint, + key_file => 'servicedeploy_rsa', + } +} diff --git a/modules/role/manifests/deployment/test.pp b/modules/role/manifests/deployment/test.pp new file mode 100644 index 0000000..37edf79 --- /dev/null +++ b/modules/role/manifests/deployment/test.pp @@ -0,0 +1,7 @@ +# === Class role::deployment::test +# Test trebuchet by installing a simple test repo +class role::deployment::test { + package { 'test/testrepo': + provider => 'trebuchet', + } +} diff --git a/templates/apache/sites/deployment.erb b/modules/role/templates/deployment/apache-vhost.erb similarity index 100% rename from templates/apache/sites/deployment.erb rename to modules/role/templates/deployment/apache-vhost.erb -- To view, visit https://gerrit.wikimedia.org/r/249090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32f74d90307244a36795f143c6d7369e4cbb7966 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
