Ori.livneh has submitted this change and it was merged.
Change subject: ipython: lint clean
......................................................................
ipython: lint clean
Change-Id: I20b30a1d7a9f88382c28548a49a8f82880d5185a
---
M modules/ipython/manifests/init.pp
M modules/ipython/manifests/notebook.pp
M modules/ipython/manifests/profile.pp
3 files changed, 65 insertions(+), 65 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ipython/manifests/init.pp
b/modules/ipython/manifests/init.pp
index 8373d85..fb04e3a 100644
--- a/modules/ipython/manifests/init.pp
+++ b/modules/ipython/manifests/init.pp
@@ -36,8 +36,8 @@
$user = 'ipython',
$group = 'ipython'
) {
- if $::operatingsystem != "Ubuntu" {
- fail("Module $module_name is not supported on $::operatingsystem")
+ if $::operatingsystem != 'Ubuntu' {
+ fail("Module ${module_name} is not supported on ${::operatingsystem}")
}
package { 'ipython':
diff --git a/modules/ipython/manifests/notebook.pp
b/modules/ipython/manifests/notebook.pp
index 70f82cd..341da9d 100644
--- a/modules/ipython/manifests/notebook.pp
+++ b/modules/ipython/manifests/notebook.pp
@@ -51,60 +51,60 @@
# Notebook session (default: none).
#
class ipython::notebook(
- $profile = 'nbserver',
- $user = $ipython::user,
- $group = $ipython::group,
- $ipythondir = $ipython::ipythondir,
- $mplconfigdir = "${ipython::ipythondir}/matplotlib",
- $notebookdir = "${ipython::ipythondir}/notebooks",
- $port = 8888,
- $ip = '*',
- $certfile = undef,
- $password = undef,
- $exec_files = []
+ $profile = 'nbserver',
+ $user = $ipython::user,
+ $group = $ipython::group,
+ $ipythondir = $ipython::ipythondir,
+ $mplconfigdir = "${ipython::ipythondir}/matplotlib",
+ $notebookdir = "${ipython::ipythondir}/notebooks",
+ $port = 8888,
+ $ip = '*',
+ $certfile = undef,
+ $password = undef,
+ $exec_files = []
) inherits ipython {
- ipython::profile { $profile: }
+ ipython::profile { $profile: }
- package { [ 'ipython-notebook', 'python-matplotlib', 'python-scipy' ]:
- ensure => latest,
- }
+ package { [ 'ipython-notebook', 'python-matplotlib', 'python-scipy' ]:
+ ensure => latest,
+ }
- file { $notebookdir:
- ensure => directory,
- owner => $user,
- group => $group,
- mode => '0775',
- }
+ file { $notebookdir:
+ ensure => directory,
+ owner => $user,
+ group => $group,
+ mode => '0775',
+ }
- file { $mplconfigdir:
- ensure => directory,
- owner => $user,
- group => $group,
- mode => '0775',
- }
+ file { $mplconfigdir:
+ ensure => directory,
+ owner => $user,
+ group => $group,
+ mode => '0775',
+ }
- file { "${profile} notebook config":
- path =>
"${ipythondir}/profile_${profile}/ipython_notebook_config.py",
- require => Ipython::Profile[$profile],
- content => template('ipython/ipython_notebook_config.py.erb'),
- owner => $user,
- group => $group,
- mode => '0444',
- }
+ file { "${profile} notebook config":
+ path =>
"${ipythondir}/profile_${profile}/ipython_notebook_config.py",
+ require => Ipython::Profile[$profile],
+ content => template('ipython/ipython_notebook_config.py.erb'),
+ owner => $user,
+ group => $group,
+ mode => '0444',
+ }
- file { '/etc/init/ipython-notebook.conf':
- content => template('ipython/ipython-notebook.conf.erb'),
- require => File["${profile} notebook config"],
- }
+ file { '/etc/init/ipython-notebook.conf':
+ content => template('ipython/ipython-notebook.conf.erb'),
+ require => File["${profile} notebook config"],
+ }
- service { 'ipython-notebook':
- ensure => running,
- provider => 'upstart',
- subscribe => File['/etc/init/ipython-notebook.conf'],
- require => [
- Package['ipython-notebook'],
- File['/etc/init/ipython-notebook.conf'],
- ],
- }
+ service { 'ipython-notebook':
+ ensure => running,
+ provider => 'upstart',
+ subscribe => File['/etc/init/ipython-notebook.conf'],
+ require => [
+ Package['ipython-notebook'],
+ File['/etc/init/ipython-notebook.conf'],
+ ],
+ }
}
diff --git a/modules/ipython/manifests/profile.pp
b/modules/ipython/manifests/profile.pp
index e793b33..b0236a3 100644
--- a/modules/ipython/manifests/profile.pp
+++ b/modules/ipython/manifests/profile.pp
@@ -15,22 +15,22 @@
# False by default.
#
define ipython::profile(
- $user = $ipython::user,
- $ipythondir = $ipython::ipythondir,
- $parallel = false
+ $user = $ipython::user,
+ $ipythondir = $ipython::ipythondir,
+ $parallel = false
) {
- include ipython
+ include ipython
- $options = $parallel ? {
- true => '--parallel',
- default => '',
- }
+ $options = $parallel ? {
+ true => '--parallel',
+ default => '',
+ }
- exec { "ipython profile ${title}":
- command => "/usr/bin/ipython profile create ${title}
${options}",
- creates => "${ipythondir}/profile_${title}",
- environment => "IPYTHONDIR=${ipythondir}",
- require => Package['ipython'],
- user => $user,
- }
+ exec { "ipython profile ${title}":
+ command => "/usr/bin/ipython profile create ${title} ${options}",
+ creates => "${ipythondir}/profile_${title}",
+ environment => "IPYTHONDIR=${ipythondir}",
+ require => Package['ipython'],
+ user => $user,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/104343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20b30a1d7a9f88382c28548a49a8f82880d5185a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
