Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/329613 )
Change subject: Fix ETCD_CA_CERT_FILE for calico/node
......................................................................
Fix ETCD_CA_CERT_FILE for calico/node
It's ETCD_CA_CERT_FILE, not ETCD_CA
Change-Id: I7dbbae0712ad560b6bc7b7b9de28b7ca314a5728
---
M modules/calico/templates/initscripts/calico-node.systemd.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/329613/1
diff --git a/modules/calico/templates/initscripts/calico-node.systemd.erb
b/modules/calico/templates/initscripts/calico-node.systemd.erb
index 0c8ebf7..72b6898 100644
--- a/modules/calico/templates/initscripts/calico-node.systemd.erb
+++ b/modules/calico/templates/initscripts/calico-node.systemd.erb
@@ -6,7 +6,7 @@
[Service]
User=root
Environment="ETCD_ENDPOINTS=<%= @etcd_endpoints.join(',') %>"
-Environment="ETCD_CA=/etc/ssl/certs/Puppet_Internal_CA.pem"
+Environment="ETCD_CA_CERT_FILE=/etc/ssl/certs/Puppet_Internal_CA.pem"
Environment="ETCD_KEY=/etc/calico/ssl/server.key"
Environment="ETCD_CERT=/etc/calico/ssl/cert.pem"
PermissionsStartOnly=true
@@ -20,7 +20,7 @@
-e IP6= \
-e NO_DEFAULT_POOLS= \
-e AS= \
- -e ETCD_CA \
+ -e ETCD_CA_CERT_FILE \
-e ETCD_KEY \
-e ETCD_CERT \
-e ETCD_SCHEME=https \
--
To view, visit https://gerrit.wikimedia.org/r/329613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7dbbae0712ad560b6bc7b7b9de28b7ca314a5728
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
