Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324699

Change subject: toollabs: Move exec_environ package list to hiera
......................................................................

toollabs: Move exec_environ package list to hiera

Bug: T152089
Change-Id: I15bf7ae799639a0a92cdd1b6796079ee8b3c1fde
---
M hieradata/labs/tools/common.yaml
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 303 insertions(+), 301 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/324699/1

diff --git a/hieradata/labs/tools/common.yaml b/hieradata/labs/tools/common.yaml
index 3e95f24..bcd3bea 100644
--- a/hieradata/labs/tools/common.yaml
+++ b/hieradata/labs/tools/common.yaml
@@ -24,3 +24,302 @@
   - tools-elastic-03.tools.eqiad.wmflabs
 
 kubelet::pod_infra_container_image: 
'docker-registry.tools.wmflabs.org/pause:2.0'
+
+toollabs::exec_environ::packages:
+  # Please keep all packages in each group sorted in alphabetical order
+  # Locales (T60500)
+  - language-pack-ar
+  - language-pack-bn
+  - language-pack-ca            # T64269, T68721
+  - language-pack-de
+  - language-pack-en
+  - language-pack-es
+  - language-pack-fr
+  - language-pack-he
+  - language-pack-hi
+  - language-pack-ja
+  - language-pack-nl
+  - language-pack-pa
+  - language-pack-pt
+  - language-pack-ru
+  - language-pack-uk            # T62730.
+  - language-pack-zh-hans
+  - language-pack-zh-hant
+
+  # Language Runtimes
+  - gcj-jre                     # T58995
+  - golang
+  - luarocks
+  - mono-complete
+  - mono-fastcgi-server         # T85142
+  - npm                         # T1102
+  - nodejs
+  - openjdk-7-jre-headless
+  - icedtea-7-jre-jamvm         # T98195
+  - python3
+  - r-base
+  - ruby1.9.3
+  - tcl8.6
+
+  # Perl libraries
+  - libberkeleydb-perl          # T60785
+  - libbot-basicbot-perl
+  - libbsd-resource-perl        # T56690.
+  - libcache-memcached-fast-perl
+  - libcgi-fast-perl            # T70269.
+  - libclass-data-inheritable-perl
+  - libcommon-sense-perl
+  - libcrypt-gcrypt-perl
+  - libcrypt-openssl-bignum-perl
+  - libcrypt-openssl-rsa-perl
+  - libdata-compare-perl        # For Checkwiki.
+  - libdata-dumper-simple-perl
+  - libdatetime-format-duration-perl
+  - libdatetime-format-strptime-perl
+  - libdbd-mysql-perl
+  - libdbd-sqlite2-perl         # T58995
+  - libdbd-sqlite3-perl
+  - libdbi-perl
+  - libdigest-crc-perl
+  - libdigest-hmac-perl
+  - libfile-nfslock-perl
+  - libgd-gd2-perl              # T69199.
+  - libhtml-format-perl
+  - libhtml-html5-entities-perl
+  - libhtml-parser-perl
+  - libhtml-template-perl       # T59123
+  - libhttp-message-perl
+  - libimage-exiftool-perl      # T55868.
+  - libio-socket-ssl-perl
+  - libipc-run-perl
+  - libirc-utils-perl
+  - libjson-perl
+  - libjson-xs-perl
+  - liblog-log4perl-perl        # T76974
+  - liblwp-protocol-https-perl
+  - libmediawiki-api-perl
+  - libmediawiki-bot-perl
+  - libnet-netmask-perl
+  - libnet-oauth-perl
+  - libnet-ssleay-perl
+  - libnetaddr-ip-perl
+  - libobject-pluggable-perl
+  - libparse-mediawikidump-perl # T76976
+  - libpod-simple-wiki-perl
+  - libpoe-component-irc-perl
+  - libpoe-component-syndicator-perl
+  - libpoe-filter-ircd-perl
+  - libpoe-perl
+  - libppix-regexp-perl         # T76974
+  - libreadonly-perl            # T76974
+  - libredis-perl
+  - libregexp-common-perl       # T76974
+  - libsocket-getaddrinfo-perl
+  - libsort-fields-perl         # T116579
+  - libstring-diff-perl
+  - libtask-weaken-perl
+  - libtest-exception-perl      # For Checkwiki.
+  - libtext-diff-perl           # T60744
+  - libtimedate-perl
+  - liburi-encode-perl
+  - liburi-perl
+  - libwww-mechanize-perl       # T59118
+  - libwww-perl
+  - libxml-libxml-perl
+  - libxml-parser-perl
+  - libxml-simple-perl
+  - libxml-xpathengine-perl     # For Checkwiki.
+  - perl-modules
+
+  # Python libraries on apt.wm.o or tools apt repo
+  # Other python package requirements are added
+  # using the genpp tool
+  - python-flask-oauth
+  - python-mwparserfromhell     # T65539
+  - python-oursql               # For danilo et al.
+  - python-socketio-client      # T86015
+  - python-wikitools
+  - python-mwclient             # for morebots et al
+
+  # PHP libraries
+  - php5-cli
+  - php5-curl
+  - php5-gd
+  - php5-imagick                # T71078.
+  - php5-intl                   # T57652
+  - php5-mcrypt
+  - php5-mysqlnd
+  - php5-pgsql                  # For access to OSM db
+  - php5-redis
+  - php5-sqlite
+  - php5-xdebug                 # T72313
+  - php5-xsl
+
+  # Fonts for vCat tool.
+  - fonts-ipafont-gothic        # Japanese fonts.
+  - ttf-indic-fonts-core        # Many Indic languages.
+
+  # Fonts for latex
+  - texlive-fonts-extra        # T137121
+
+  # tcl packages
+  - mysqltcl
+  - tcl-tls                     # T58995
+  - tcl-trf                     # T58995
+  - tclcurl
+  - tcllib
+  - tdom                        # T58995
+
+  # Tesseract OCR (T67354).
+  - tesseract-ocr
+  - tesseract-ocr-afr
+  - tesseract-ocr-ara
+  - tesseract-ocr-aze
+  - tesseract-ocr-bel
+  - tesseract-ocr-ben
+  - tesseract-ocr-bul
+  - tesseract-ocr-cat
+  - tesseract-ocr-ces
+  - tesseract-ocr-chi-sim
+  - tesseract-ocr-chi-tra
+  - tesseract-ocr-chr
+  - tesseract-ocr-dan
+  - tesseract-ocr-deu
+  - tesseract-ocr-deu-frak
+  - tesseract-ocr-ell
+  - tesseract-ocr-eng
+  - tesseract-ocr-enm
+  - tesseract-ocr-epo
+  - tesseract-ocr-equ
+  - tesseract-ocr-est
+  - tesseract-ocr-eus
+  - tesseract-ocr-fin
+  - tesseract-ocr-fra
+  - tesseract-ocr-frk
+  - tesseract-ocr-frm
+  - tesseract-ocr-glg
+  - tesseract-ocr-heb
+  - tesseract-ocr-hin
+  - tesseract-ocr-hrv
+  - tesseract-ocr-hun
+  - tesseract-ocr-ind
+  - tesseract-ocr-isl
+  - tesseract-ocr-ita
+  - tesseract-ocr-ita-old
+  - tesseract-ocr-jpn
+  - tesseract-ocr-kan
+  - tesseract-ocr-kor
+  - tesseract-ocr-lav
+  - tesseract-ocr-lit
+  - tesseract-ocr-mal
+  - tesseract-ocr-mkd
+  - tesseract-ocr-mlt
+  - tesseract-ocr-msa
+  - tesseract-ocr-nld
+  - tesseract-ocr-nor
+  - tesseract-ocr-osd
+  - tesseract-ocr-pol
+  - tesseract-ocr-por
+  - tesseract-ocr-ron
+  - tesseract-ocr-rus
+  - tesseract-ocr-slk
+  - tesseract-ocr-slk-frak
+  - tesseract-ocr-slv
+  - tesseract-ocr-spa
+  - tesseract-ocr-spa-old
+  - tesseract-ocr-sqi
+  - tesseract-ocr-srp
+  - tesseract-ocr-swa
+  - tesseract-ocr-swe
+  - tesseract-ocr-tam
+  - tesseract-ocr-tel
+  - tesseract-ocr-tgl
+  - tesseract-ocr-tha
+  - tesseract-ocr-tur
+  - tesseract-ocr-ukr
+  - tesseract-ocr-vie
+
+  # Other packages
+  - adminbot
+  - bison                       # T67974.
+  - calibre                     # T100165
+  - csh                         # common user request
+  - csvtool                     # T60649
+  - dc
+  - djvulibre-bin               # T58972
+  - djvulibre-plugin            # T58972
+  - doxygen                     # T58326
+  - doxygen-latex               # T58326
+  - expect
+  - fabric                      # T56135.
+  - gawk                        # T67974.
+  - gdal-bin
+  - git-review                  # T64871.
+  - git-svn
+  - gnuplot-nox
+  - graphicsmagick              # T58995
+  - graphviz
+  - grep
+  - hugin-tools                 # T108210
+  - hunspell                    # T125193
+  - inkscape                    # T126933
+  - iotop                       # useful for labs admins to monitor tools
+  - ksh
+  - libaio1                     # T70615
+  - libav-tools                 # T55870.
+  - libdmtx0a                   # T55867.
+  - libfcgi0ldbl                # T58995
+  - libffi-dev                  # T67974.
+  - libfreetype6
+  - libgdbm-dev                 # T67974.
+  - libgeoip1                   # T64649
+  - libhunspell-dev             # T125193
+  - libjpeg-turbo-progs         # T61654.
+  - libmpfr4
+  - libncurses5-dev             # T67974.
+  - libneon27-gnutls
+  - libnfnetlink0
+  - libnspr4
+  - libnss3
+  - libnss3-1d
+  - libotf0
+  - libpcsclite1
+  - libpng3
+  - libproj0                    # T58995
+  - libquadmath0
+  - librsvg2-bin                # T60516
+  - libsvn1
+  - libvips-tools
+  - libxml2-utils               # T64944.
+  - libyaml-dev                 # T67974.
+  - libzbar0                    # T58996
+  - mailutils                   # T114073
+  - mdbtools                    # T50805.
+  - melt                        # T71365
+  - openbabel                   # T68995
+  - p7zip-full                  # requested by Betacommand and danilo to 
decompress 7z files
+  - pdf2svg                     # T70092.
+  - pdf2djvu                    # T130138
+  - pdftk                       # T67048.
+  - phantomjs                   # T68928
+  - phpunit
+  - poppler-utils               # T55869.
+  - postgis                     # T76226
+  - postgresql-client
+  - pstoedit                    # T59000
+  - rrdtool                     # T59004
+  - socat                       # T59005
+  - supybot                     # T63088.
+  - tabix                       # T63501
+  - texinfo                     # T58994
+  - texlive
+  - ufraw-batch                 # T59008
+  - virtualenvwrapper           # T131840
+  - whois                       # T98555
+  - xml2                        # T134146.
+  - xsltproc                    # T68962.
+  - xvfb                        # T100268
+  - zbar-tools                  # T58996
+  - zsh                         # T58995
+  - debootstrap                 # T138138
+  - fakechroot                  # T138138
diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index c751394..04e6805 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -5,7 +5,9 @@
 # Actual runtime dependencies for tools live here.
 #
 
-class toollabs::exec_environ {
+class toollabs::exec_environ(
+    $packages,
+) {
 
     include locales::extended
     include identd
@@ -21,306 +23,7 @@
     # T65000
     include ::imagemagick::install
 
-    package { [
-        # Please keep all packages in each group sorted in alphabetical order
-
-        # Locales (T60500)
-        'language-pack-ar',
-        'language-pack-bn',
-        'language-pack-ca',            # T64269, T68721
-        'language-pack-de',
-        'language-pack-en',
-        'language-pack-es',
-        'language-pack-fr',
-        'language-pack-he',
-        'language-pack-hi',
-        'language-pack-ja',
-        'language-pack-nl',
-        'language-pack-pa',
-        'language-pack-pt',
-        'language-pack-ru',
-        'language-pack-uk',            # T62730.
-        'language-pack-zh-hans',
-        'language-pack-zh-hant',
-
-        # Language Runtimes
-        'gcj-jre',                     # T58995
-        'golang',
-        'luarocks',
-        'mono-complete',
-        'mono-fastcgi-server',         # T85142
-        'npm',                         # T1102
-        'nodejs',
-        'openjdk-7-jre-headless',
-        'icedtea-7-jre-jamvm',         # T98195
-        'python3',
-        'r-base',
-        'ruby1.9.3',
-        'tcl8.6',
-
-        # Perl libraries
-        'libberkeleydb-perl',          # T60785
-        'libbot-basicbot-perl',
-        'libbsd-resource-perl',        # T56690.
-        'libcache-memcached-fast-perl',
-        'libcgi-fast-perl',            # T70269.
-        'libclass-data-inheritable-perl',
-        'libcommon-sense-perl',
-        'libcrypt-gcrypt-perl',
-        'libcrypt-openssl-bignum-perl',
-        'libcrypt-openssl-rsa-perl',
-        'libdata-compare-perl',        # For Checkwiki.
-        'libdata-dumper-simple-perl',
-        'libdatetime-format-duration-perl',
-        'libdatetime-format-strptime-perl',
-        'libdbd-mysql-perl',
-        'libdbd-sqlite2-perl',         # T58995
-        'libdbd-sqlite3-perl',
-        'libdbi-perl',
-        'libdigest-crc-perl',
-        'libdigest-hmac-perl',
-        'libfile-nfslock-perl',
-        'libgd-gd2-perl',              # T69199.
-        'libhtml-format-perl',
-        'libhtml-html5-entities-perl',
-        'libhtml-parser-perl',
-        'libhtml-template-perl',       # T59123
-        'libhttp-message-perl',
-        'libimage-exiftool-perl',      # T55868.
-        'libio-socket-ssl-perl',
-        'libipc-run-perl',
-        'libirc-utils-perl',
-        'libjson-perl',
-        'libjson-xs-perl',
-        'liblog-log4perl-perl',        # T76974
-        'liblwp-protocol-https-perl',
-        'libmediawiki-api-perl',
-        'libmediawiki-bot-perl',
-        'libnet-netmask-perl',
-        'libnet-oauth-perl',
-        'libnet-ssleay-perl',
-        'libnetaddr-ip-perl',
-        'libobject-pluggable-perl',
-        'libparse-mediawikidump-perl', # T76976
-        'libpod-simple-wiki-perl',
-        'libpoe-component-irc-perl',
-        'libpoe-component-syndicator-perl',
-        'libpoe-filter-ircd-perl',
-        'libpoe-perl',
-        'libppix-regexp-perl',         # T76974
-        'libreadonly-perl',            # T76974
-        'libredis-perl',
-        'libregexp-common-perl',       # T76974
-        'libsocket-getaddrinfo-perl',
-        'libsort-fields-perl',         # T116579
-        'libstring-diff-perl',
-        'libtask-weaken-perl',
-        'libtest-exception-perl',      # For Checkwiki.
-        'libtext-diff-perl',           # T60744
-        'libtimedate-perl',
-        'liburi-encode-perl',
-        'liburi-perl',
-        'libwww-mechanize-perl',       # T59118
-        'libwww-perl',
-        'libxml-libxml-perl',
-        'libxml-parser-perl',
-        'libxml-simple-perl',
-        'libxml-xpathengine-perl',     # For Checkwiki.
-        'perl-modules',
-
-        # Python libraries on apt.wm.o or tools apt repo
-        # Other python package requirements are added
-        # using the genpp tool
-        'python-flask-oauth',
-        'python-mwparserfromhell',     # T65539
-        'python-oursql',               # For danilo et al.
-        'python-socketio-client',      # T86015
-        'python-wikitools',
-        'python-mwclient',             # for morebots et al
-
-        # PHP libraries
-        'php5-cli',
-        'php5-curl',
-        'php5-gd',
-        'php5-imagick',                # T71078.
-        'php5-intl',                   # T57652
-        'php5-mcrypt',
-        'php5-mysqlnd',
-        'php5-pgsql',                  # For access to OSM db
-        'php5-redis',
-        'php5-sqlite',
-        'php5-xdebug',                 # T72313
-        'php5-xsl',
-
-        # Fonts for vCat tool.
-        'fonts-ipafont-gothic',        # Japanese fonts.
-        'ttf-indic-fonts-core',        # Many Indic languages.
-
-        # Fonts for latex
-        'texlive-fonts-extra',        # T137121
-
-        # tcl packages
-        'mysqltcl',
-        'tcl-tls',                     # T58995
-        'tcl-trf',                     # T58995
-        'tclcurl',
-        'tcllib',
-        'tdom',                        # T58995
-
-        # Tesseract OCR (T67354).
-        'tesseract-ocr',
-        'tesseract-ocr-afr',
-        'tesseract-ocr-ara',
-        'tesseract-ocr-aze',
-        'tesseract-ocr-bel',
-        'tesseract-ocr-ben',
-        'tesseract-ocr-bul',
-        'tesseract-ocr-cat',
-        'tesseract-ocr-ces',
-        'tesseract-ocr-chi-sim',
-        'tesseract-ocr-chi-tra',
-        'tesseract-ocr-chr',
-        'tesseract-ocr-dan',
-        'tesseract-ocr-deu',
-        'tesseract-ocr-deu-frak',
-        'tesseract-ocr-ell',
-        'tesseract-ocr-eng',
-        'tesseract-ocr-enm',
-        'tesseract-ocr-epo',
-        'tesseract-ocr-equ',
-        'tesseract-ocr-est',
-        'tesseract-ocr-eus',
-        'tesseract-ocr-fin',
-        'tesseract-ocr-fra',
-        'tesseract-ocr-frk',
-        'tesseract-ocr-frm',
-        'tesseract-ocr-glg',
-        'tesseract-ocr-heb',
-        'tesseract-ocr-hin',
-        'tesseract-ocr-hrv',
-        'tesseract-ocr-hun',
-        'tesseract-ocr-ind',
-        'tesseract-ocr-isl',
-        'tesseract-ocr-ita',
-        'tesseract-ocr-ita-old',
-        'tesseract-ocr-jpn',
-        'tesseract-ocr-kan',
-        'tesseract-ocr-kor',
-        'tesseract-ocr-lav',
-        'tesseract-ocr-lit',
-        'tesseract-ocr-mal',
-        'tesseract-ocr-mkd',
-        'tesseract-ocr-mlt',
-        'tesseract-ocr-msa',
-        'tesseract-ocr-nld',
-        'tesseract-ocr-nor',
-        'tesseract-ocr-osd',
-        'tesseract-ocr-pol',
-        'tesseract-ocr-por',
-        'tesseract-ocr-ron',
-        'tesseract-ocr-rus',
-        'tesseract-ocr-slk',
-        'tesseract-ocr-slk-frak',
-        'tesseract-ocr-slv',
-        'tesseract-ocr-spa',
-        'tesseract-ocr-spa-old',
-        'tesseract-ocr-sqi',
-        'tesseract-ocr-srp',
-        'tesseract-ocr-swa',
-        'tesseract-ocr-swe',
-        'tesseract-ocr-tam',
-        'tesseract-ocr-tel',
-        'tesseract-ocr-tgl',
-        'tesseract-ocr-tha',
-        'tesseract-ocr-tur',
-        'tesseract-ocr-ukr',
-        'tesseract-ocr-vie',
-
-        # Other packages
-        'adminbot',
-        'bison',                       # T67974.
-        'calibre',                     # T100165
-        'csh',                         # common user request
-        'csvtool',                     # T60649
-        'dc',
-        'djvulibre-bin',               # T58972
-        'djvulibre-plugin',            # T58972
-        'doxygen',                     # T58326
-        'doxygen-latex',               # T58326
-        'expect',
-        'fabric',                      # T56135.
-        'gawk',                        # T67974.
-        'gdal-bin',
-        'git-review',                  # T64871.
-        'git-svn',
-        'gnuplot-nox',
-        'graphicsmagick',              # T58995
-        'graphviz',
-        'grep',
-        'hugin-tools',                 # T108210
-        'hunspell',                    # T125193
-        'inkscape',                    # T126933
-        'iotop',                       # useful for labs admins to monitor 
tools
-        'ksh',
-        'libaio1',                     # T70615
-        'libav-tools',                 # T55870.
-        'libdmtx0a',                   # T55867.
-        'libfcgi0ldbl',                # T58995
-        'libffi-dev',                  # T67974.
-        'libfreetype6',
-        'libgdbm-dev',                 # T67974.
-        'libgeoip1',                   # T64649
-        'libhunspell-dev',             # T125193
-        'libjpeg-turbo-progs',         # T61654.
-        'libmpfr4',
-        'libncurses5-dev',             # T67974.
-        'libneon27-gnutls',
-        'libnfnetlink0',
-        'libnspr4',
-        'libnss3',
-        'libnss3-1d',
-        'libotf0',
-        'libpcsclite1',
-        'libpng3',
-        'libproj0',                    # T58995
-        'libquadmath0',
-        'librsvg2-bin',                # T60516
-        'libsvn1',
-        'libvips-tools',
-        'libxml2-utils',               # T64944.
-        'libyaml-dev',                 # T67974.
-        'libzbar0',                    # T58996
-        'mailutils',                   # T114073
-        'mdbtools',                    # T50805.
-        'melt',                        # T71365
-        'openbabel',                   # T68995
-        'p7zip-full',                  # requested by Betacommand and danilo 
to decompress 7z files
-        'pdf2svg',                     # T70092.
-        'pdf2djvu',                    # T130138
-        'pdftk',                       # T67048.
-        'phantomjs',                   # T68928
-        'phpunit',
-        'poppler-utils',               # T55869.
-        'postgis',                     # T76226
-        'postgresql-client',
-        'pstoedit',                    # T59000
-        'rrdtool',                     # T59004
-        'socat',                       # T59005
-        'supybot',                     # T63088.
-        'tabix',                       # T63501
-        'texinfo',                     # T58994
-        'texlive',
-        'ufraw-batch',                 # T59008
-        'virtualenvwrapper',           # T131840
-        'whois',                       # T98555
-        'xml2',                        # T134146.
-        'xsltproc',                    # T68962.
-        'xvfb',                        # T100268
-        'zbar-tools',                  # T58996
-        'zsh',                         # T58995
-        'debootstrap',                 # T138138
-        'fakechroot',                  # T138138
-        ]:
+    package { $packages:
         ensure => latest,
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15bf7ae799639a0a92cdd1b6796079ee8b3c1fde
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>

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

Reply via email to