jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333888 )
Change subject: Migrate Swift role from upstart to systemd ...................................................................... Migrate Swift role from upstart to systemd Bug: T154269 Change-Id: Iaf6e84c4b469e108099901a5121b0adf8b354995 --- M puppet/modules/apt/manifests/init.pp A puppet/modules/apt/templates/backports.list.erb M puppet/modules/role/templates/swift/apache2.conf.erb M puppet/modules/swift/manifests/init.pp M puppet/modules/swift/manifests/ring.pp M puppet/modules/swift/manifests/service.pp M puppet/modules/swift/templates/conf.php.erb A puppet/modules/swift/templates/systemd/swift.erb D puppet/modules/swift/templates/upstart.erb 9 files changed, 52 insertions(+), 25 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/apt/manifests/init.pp b/puppet/modules/apt/manifests/init.pp index 0e17d91..9f50e87 100644 --- a/puppet/modules/apt/manifests/init.pp +++ b/puppet/modules/apt/manifests/init.pp @@ -32,6 +32,11 @@ before => Exec['apt-get update'], } + file { '/etc/apt/sources.list.d/backports.list': + content => template('apt/backports.list.erb'), + before => Exec['apt-get update'], + } + # T125760 - mw-vagrant only apt repo file { '/etc/apt/sources.list.d/mwv-apt.list': content => template('apt/mwv-apt.list.erb'), diff --git a/puppet/modules/apt/templates/backports.list.erb b/puppet/modules/apt/templates/backports.list.erb new file mode 100644 index 0000000..b692982 --- /dev/null +++ b/puppet/modules/apt/templates/backports.list.erb @@ -0,0 +1 @@ +deb http://ftp.debian.org/debian <%= scope['::lsbdistcodename'] %>-backports main diff --git a/puppet/modules/role/templates/swift/apache2.conf.erb b/puppet/modules/role/templates/swift/apache2.conf.erb index 188f778..68fd970 100644 --- a/puppet/modules/role/templates/swift/apache2.conf.erb +++ b/puppet/modules/role/templates/swift/apache2.conf.erb @@ -1,4 +1,4 @@ LoadModule proxy_module modules/mod_proxy.so LoadModule proxy_http_module modules/mod_proxy_http.so LogLevel trace8 -ProxyPassMatch "^/images/(.*)$" "http://127.0.0.1:<%= scope['::swift::port'] %>/wiki/en/$1" \ No newline at end of file +ProxyPassMatch "^/images/(.*)$" "http://127.0.0.1:<%= scope['::swift::port'] %>/wiki/dev/$1" \ No newline at end of file diff --git a/puppet/modules/swift/manifests/init.pp b/puppet/modules/swift/manifests/init.pp index fa74445..5365125 100644 --- a/puppet/modules/swift/manifests/init.pp +++ b/puppet/modules/swift/manifests/init.pp @@ -49,6 +49,30 @@ include ::apache::mod::proxy include ::apache::mod::proxy_http + apt::pin { 'python-swift-jessie-backports': + package => 'python-swift*', + pin => 'release n=jessie-backports', + priority => 1000, + } + + apt::pin { 'python-eventlet-jessie-backports': + package => 'python-eventlet', + pin => 'release n=jessie-backports', + priority => 1000, + } + + apt::pin { 'python-webob-jessie-backports': + package => 'python-webob', + pin => 'release n=jessie-backports', + priority => 1000, + } + + apt::pin { 'swift-jessie-backports': + package => 'swift*', + pin => 'release n=jessie-backports', + priority => 1000, + } + require_package('swift') require_package('swift-account') require_package('swift-container') diff --git a/puppet/modules/swift/manifests/ring.pp b/puppet/modules/swift/manifests/ring.pp index 479abc3..152dbc0 100644 --- a/puppet/modules/swift/manifests/ring.pp +++ b/puppet/modules/swift/manifests/ring.pp @@ -40,7 +40,7 @@ } exec { "${ring_type}/create_ring": - command => "swift-ring-builder ${ring_type}.builder create 18 3 1", + command => "swift-ring-builder ${ring_type}.builder create 18 1 1", user => 'swift', cwd => '/etc/swift', notify => Exec["${ring_type}/add_ring"], diff --git a/puppet/modules/swift/manifests/service.pp b/puppet/modules/swift/manifests/service.pp index 039c211..dccd97d 100644 --- a/puppet/modules/swift/manifests/service.pp +++ b/puppet/modules/swift/manifests/service.pp @@ -16,18 +16,13 @@ define swift::service( $cfg_file, ) { - file { "/etc/init/swift-${title}.conf": - ensure => present, - content => template('swift/upstart.erb'), - mode => '0444', - } - - service { "swift-${title}": - ensure => running, - enable => true, - provider => 'upstart', - subscribe => File[$cfg_file], - require => File[$cfg_file, "/etc/init/swift-${title}.conf"], + systemd::service { "swift-${title}": + ensure => 'present', + require => File[$cfg_file], + service_params => { + subscribe => File[$cfg_file], + }, + template_name => 'swift', } rsyslog::conf { "rsyslog-swift-${title}": diff --git a/puppet/modules/swift/templates/conf.php.erb b/puppet/modules/swift/templates/conf.php.erb index c74dd21..e1c09bc 100644 --- a/puppet/modules/swift/templates/conf.php.erb +++ b/puppet/modules/swift/templates/conf.php.erb @@ -25,5 +25,5 @@ 'transformVia404' => !$wgGenerateThumbnailOnParse, 'deletedDir' => $wgDeletedDirectory, 'deletedHashLevels' => $wgHashedUploadDirectory ? 3 : 0, - 'wikiId' => 'wiki-en', + 'wikiId' => 'wiki-dev', ); \ No newline at end of file diff --git a/puppet/modules/swift/templates/systemd/swift.erb b/puppet/modules/swift/templates/systemd/swift.erb new file mode 100644 index 0000000..dcbdf97 --- /dev/null +++ b/puppet/modules/swift/templates/systemd/swift.erb @@ -0,0 +1,12 @@ +[Unit] +Description=<%= @title %> service +Requires=mediawiki-ready.service +After=mediawiki-ready.service + +[Service] +SyslogIdentifier=<%= @title %> +ExecStart=/usr/bin/<%= @title %> <%= @cfg_file %> +Restart=always + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/puppet/modules/swift/templates/upstart.erb b/puppet/modules/swift/templates/upstart.erb deleted file mode 100644 index e3dc7d2..0000000 --- a/puppet/modules/swift/templates/upstart.erb +++ /dev/null @@ -1,10 +0,0 @@ -##################################################################### -### THIS FILE IS MANAGED BY PUPPET -##################################################################### - -description "swift-<%= @title %>" - -start on mediawiki-ready -respawn - -exec /usr/bin/swift-<%= @title %> <%= @cfg_file %> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/333888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf6e84c4b469e108099901a5121b0adf8b354995 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: jessie-migration Gerrit-Owner: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits