[MediaWiki-commits] [Gerrit] operations/puppet[production]: Specify the registry as well for calico/node

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329612 )

Change subject: Specify the registry as well for calico/node
..


Specify the registry as well for calico/node

Leaving the registry out is clearly a mistake and docker decides to try
docker.io hub instead

Change-Id: I9abff7f0541a2a9ae468446fd513d929888b7645
---
M modules/calico/templates/initscripts/calico-node.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/calico/templates/initscripts/calico-node.systemd.erb 
b/modules/calico/templates/initscripts/calico-node.systemd.erb
index e78382b..0c8ebf7 100644
--- a/modules/calico/templates/initscripts/calico-node.systemd.erb
+++ b/modules/calico/templates/initscripts/calico-node.systemd.erb
@@ -31,7 +31,7 @@
   -v /run/docker/plugins:/run/docker/plugins \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -v /var/log/calico:/var/log/calico \
-  calico/node:<%= @calico_node_version %>
+  <%= @registry %>/calico/node:<%= @calico_node_version %>
 ExecStop=/usr/bin/docker rm -f calico-node
 Restart=always
 RestartSec=10

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9abff7f0541a2a9ae468446fd513d929888b7645
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Specify the registry as well for calico/node

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329612 )

Change subject: Specify the registry as well for calico/node
..

Specify the registry as well for calico/node

Leaving the registry out is clearly a mistake and docker decides to try
docker.io hub instead

Change-Id: I9abff7f0541a2a9ae468446fd513d929888b7645
---
M modules/calico/templates/initscripts/calico-node.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/329612/1

diff --git a/modules/calico/templates/initscripts/calico-node.systemd.erb 
b/modules/calico/templates/initscripts/calico-node.systemd.erb
index e78382b..0c8ebf7 100644
--- a/modules/calico/templates/initscripts/calico-node.systemd.erb
+++ b/modules/calico/templates/initscripts/calico-node.systemd.erb
@@ -31,7 +31,7 @@
   -v /run/docker/plugins:/run/docker/plugins \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -v /var/log/calico:/var/log/calico \
-  calico/node:<%= @calico_node_version %>
+  <%= @registry %>/calico/node:<%= @calico_node_version %>
 ExecStop=/usr/bin/docker rm -f calico-node
 Restart=always
 RestartSec=10

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9abff7f0541a2a9ae468446fd513d929888b7645
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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