opendev/system-config
Code Issues Proposed changes

Set the nodepool user and key on dib images

Browse Source 
We need to set the nodepool user and key on dib images so that dib can
run the pre use check script on the nodes (without these values nodepool
uses invalid defaults). Logically this appears to be part of the image
building process but the post slave boot check scripts need it too.

Change-Id: I51c7da1d58c2550903ad1671dcfb477b06424cfd
This commit is contained in:
Clark Boylan 2014-09-23 15:51:21 -07:00
parent 5b399fb30d
commit ecc0240b5c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/templates/nodepool/nodepool.yaml.erb
View File

@ -509,6 +509,8 @@ providers:
- name: devstack-trusty-dib - name: devstack-trusty-dib
min-ram: 30720 min-ram: 30720
diskimage: devstack-trusty-dib diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
@ -582,6 +584,8 @@ providers:
- name: devstack-trusty-dib - name: devstack-trusty-dib
min-ram: 30720 min-ram: 30720
diskimage: devstack-trusty-dib diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
@ -655,6 +659,8 @@ providers:
- name: devstack-trusty-dib - name: devstack-trusty-dib
min-ram: 30720 min-ram: 30720
diskimage: devstack-trusty-dib diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
@ -729,6 +735,8 @@ providers:
- name: devstack-trusty-dib - name: devstack-trusty-dib
min-ram: 30720 min-ram: 30720
diskimage: devstack-trusty-dib diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
@ -804,6 +812,8 @@ providers:
- name: devstack-trusty-dib - name: devstack-trusty-dib
min-ram: 30720 min-ram: 30720
diskimage: devstack-trusty-dib diskimage: devstack-trusty-dib
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720