Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388075 )
Change subject: Create module for docker-pkg software
......................................................................
Create module for docker-pkg software
The docker-pkg software, while obviously reliant on docker and
complimentary to it, is better residing in it's own puppet module.
Create a new module named docker_pkg and move the docker::builder class
in it. In the profile::docker::builder class, if guard s usage so we
can disable it in environments where scap is not/can not be installed
Raise tjat flag for production
Change-Id: I9db74d7c0aff28af688243b549b39a5b9be5a76d
---
M hieradata/role/common/builder.yaml
R modules/docker_pkg/manifests/init.pp
M modules/profile/manifests/ci/shipyard.pp
M modules/profile/manifests/docker/builder.pp
M modules/profile/templates/ci/shipyard/docker-pkg-integration-config.yaml.erb
5 files changed, 17 insertions(+), 6 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/builder.yaml
b/hieradata/role/common/builder.yaml
index c27befc..f4ebcac 100644
--- a/hieradata/role/common/builder.yaml
+++ b/hieradata/role/common/builder.yaml
@@ -6,6 +6,7 @@
iptables: false
profile::docker::builder::proxy_address: "webproxy.%{::site}.wmnet"
profile::docker::builder::proxy_port: "8080"
+profile::docker::builder::docker_pkg: true
monitor_screens: false
# The default setup has no lvm, so no source
#profile::docker::storage::loopback::dm_source: null
diff --git a/modules/docker/manifests/builder.pp
b/modules/docker_pkg/manifests/init.pp
similarity index 86%
rename from modules/docker/manifests/builder.pp
rename to modules/docker_pkg/manifests/init.pp
index 634a870..01cb5b0 100644
--- a/modules/docker/manifests/builder.pp
+++ b/modules/docker_pkg/manifests/init.pp
@@ -1,7 +1,7 @@
-# === Class docker::builder
+# === Class docker_pkg
#
# Installs all tools needed to build docker images for the WMF.
-class docker::builder () {
+class docker_pkg () {
require_package([
'python3', 'python3-virtualenv',
'virtualenv', 'python3-pip',
diff --git a/modules/profile/manifests/ci/shipyard.pp
b/modules/profile/manifests/ci/shipyard.pp
index c36b3a2..d67b630 100644
--- a/modules/profile/manifests/ci/shipyard.pp
+++ b/modules/profile/manifests/ci/shipyard.pp
@@ -4,7 +4,7 @@
$password = hiera('docker::registry::password'),
$http_proxy = hiera('http_proxy', undef),
) {
- class { '::docker::builder': }
+ class { '::docker_pkg': }
file { '/etc/docker-pkg/':
ensure => directory,
diff --git a/modules/profile/manifests/docker/builder.pp
b/modules/profile/manifests/docker/builder.pp
index b50a4bd..09afe57 100644
--- a/modules/profile/manifests/docker/builder.pp
+++ b/modules/profile/manifests/docker/builder.pp
@@ -11,14 +11,24 @@
#
# [*registry*] Address of the docker registry.
#
+# [*username*] username for the docker registry.
+#
+# [*password*] password for the docker registry.
+#
+# [*docker_pkg*] Boolean value for enabling the docker_pkg component
+#
class profile::docker::builder(
$proxy_address = hiera('profile::docker::builder::proxy_address', undef),
$proxy_port = hiera('profile::docker::builder::proxy_port', undef),
$registry = hiera('docker::registry'),
$username = hiera('docker::registry::username'),
- $password = hiera('docker::registry::password')
+ $password = hiera('docker::registry::password'),
+ $docker_pkg = hiera('profile::docker::docker_pkg', false),
) {
- class { '::docker::builder': }
+
+ if $docker_pkg {
+ class { '::docker_pkg': }
+ }
class { 'service::deploy::common': }
diff --git
a/modules/profile/templates/ci/shipyard/docker-pkg-integration-config.yaml.erb
b/modules/profile/templates/ci/shipyard/docker-pkg-integration-config.yaml.erb
index c9fd37a..87e6083 100644
---
a/modules/profile/templates/ci/shipyard/docker-pkg-integration-config.yaml.erb
+++
b/modules/profile/templates/ci/shipyard/docker-pkg-integration-config.yaml.erb
@@ -3,4 +3,4 @@
seed_image: docker-registry.wikimedia.org/wikimedia-jessie:latest
username: <%= @username %>
password: <%= @password %>
-http_proxy: <%= @http_proxy %>
+http_proxy: <%= @http_proxy %>
--
To view, visit https://gerrit.wikimedia.org/r/388075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9db74d7c0aff28af688243b549b39a5b9be5a76d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
