Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/257597
Change subject: nodepool: drop domain from instance hostnames
......................................................................
nodepool: drop domain from instance hostnames
'contintcloud.eqiad.wmflabs.' is inserted twice because Nodepool uses a
fqdn for the hostname:
ci-jessie-wikimedia-11345.contintcloud.eqiad.wmflabs.contintcloud.eqiad.wmflabs.
Drop the domain from Jenkins targets hostname/subnode-hostname.
Bug: T120792
Change-Id: I8e7df490ae8605f88faed788f597920f31ff8328
---
M modules/nodepool/templates/nodepool.yaml.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/257597/1
diff --git a/modules/nodepool/templates/nodepool.yaml.erb
b/modules/nodepool/templates/nodepool.yaml.erb
index 6366b2b..4db59b4 100644
--- a/modules/nodepool/templates/nodepool.yaml.erb
+++ b/modules/nodepool/templates/nodepool.yaml.erb
@@ -42,8 +42,8 @@
user: '<%= @jenkins_api_user -%>'
apikey: '<%= @jenkins_api_key -%>'
credentials-id: '<%= @jenkins_credentials_id -%>'
- hostname: '{label.name}-{node_id}.<%= @openstack_tenant_id
-%>.eqiad.wmflabs'
- subnode-hostname: '{label.name}-{node_id}-{subnode_id}.<%=
@openstack_tenant_id -%>.eqiad.wmflabs'
+ hostname: '{label.name}-{node_id}'
+ subnode-hostname: '{label.name}-{node_id}-{subnode_id}'
# Jenkins labels
#
--
To view, visit https://gerrit.wikimedia.org/r/257597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e7df490ae8605f88faed788f597920f31ff8328
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
