opendev/system-config
Code Issues Proposed changes

Merge "Use a current Trusty image name in hpcloud"

Browse Source
This commit is contained in:
Jenkins 2014-08-04 20:44:23 +00:00 committed by Gerrit Code Review
commit 1d854cf598
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,13 +433,13 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty - name: devstack-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_bare.sh setup: prepare_node_bare.sh
username: jenkins username: jenkins
@ -499,13 +499,13 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty - name: devstack-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_bare.sh setup: prepare_node_bare.sh
username: jenkins username: jenkins
@ -565,13 +565,13 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty - name: devstack-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_bare.sh setup: prepare_node_bare.sh
username: jenkins username: jenkins
@ -631,13 +631,13 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty - name: devstack-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_bare.sh setup: prepare_node_bare.sh
username: jenkins username: jenkins
@ -697,13 +697,13 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-trusty - name: devstack-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty - name: bare-trusty
base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
min-ram: 30720 min-ram: 30720
setup: prepare_node_bare.sh setup: prepare_node_bare.sh
username: jenkins username: jenkins