Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227461
Change subject: nodepool: stop using diskimage
......................................................................
nodepool: stop using diskimage
Diskimage is yet another image creation tool and we probably have
enough. Moreover Nodepool would require root access on the machine to
rebuild image periodically.
Stop using diskimage-builder
Switch to `base-image` which instructs Nodepool to use the given image
name provided by the cloud provider (wmflabs)
Change image name from ci-dib-jessie-wikimedia to ci-jessie-wikimedia
RelEng will build and upload the image manually for now.
Change-Id: I27fb0bf5843bfad53ba610da948bc4935f0391df
---
M modules/nodepool/templates/nodepool.yaml.erb
1 file changed, 5 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/227461/1
diff --git a/modules/nodepool/templates/nodepool.yaml.erb
b/modules/nodepool/templates/nodepool.yaml.erb
index 6e0a80e..c6ee675 100644
--- a/modules/nodepool/templates/nodepool.yaml.erb
+++ b/modules/nodepool/templates/nodepool.yaml.erb
@@ -47,8 +47,8 @@
# Jenkins labels
labels:
- - name: ci-dib-jessie-wikimedia
- image: ci-dib-jessie-wikimedia
+ - name: ci-jessie-wikimedia
+ image: ci-jessie-wikimedia
#ready-script: ready.sh
min-ready: 1
providers:
@@ -69,8 +69,9 @@
# 'eqiad.wmflabs' is magically added by wmflabs
template-hostname: '{image.name}-{timestamp}'
images:
- - name: ci-dib-jessie-wikimedia
- diskimage: ci-dib-jessie-wikimedia
+ - name: ci-jessie-wikimedia
+ # RelEng manually build and upload the image to Glance
+ base-image: ci-jessie-wikimedia
meta:
properties:
# Let Horizon/Wikitech display the image (T105015)
@@ -80,30 +81,3 @@
#setup: setup.sh
username: jenkins
private-key: /var/lib/nodepool/.ssh/dib_jenkins_id_rsa
-
-# See doc at http://docs.openstack.org/developer/diskimage-builder/
-diskimages:
- - name: ci-dib-jessie-wikimedia
- elements:
- - debian
- - debian-systemd
- - cloud-init-datasources
- - vm
- - devuser
- - wikimedia-networking
- - nodepool-base
- release: jessie
- env-vars:
- DIB_IMAGE_CACHE: '<%= @dib_cache_dir -%>'
- QEMU_IMG_OPTIONS: compat=0.10
-
- # debian element
- DIB_RELEASE: jessie
- DIB_DISTRIBUTION_MIRROR: http://mirrors.wikimedia.org/debian/
-
- # cloud-init-datasources
- DIB_CLOUD_INIT_DATASOURCES: Ec2
-
- # devuser element
- DIB_DEV_USER_USERNAME: jenkins
- DIB_DEV_USER_AUTHORIZED_KEYS:
/var/lib/nodepool/.ssh/dib_jenkins_id_rsa.pub
--
To view, visit https://gerrit.wikimedia.org/r/227461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27fb0bf5843bfad53ba610da948bc4935f0391df
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
