Merge "Use correct flavors for centos7 and fedora23 in rax"

This commit is contained in:
Jenkins 2016-03-23 20:47:07 +00:00 committed by Gerrit Code Review
commit 5784a6afda

View File

@ -176,13 +176,21 @@ providers:
diskimage: fedora-23
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: centos-7
min-ram: 8192
diskimage: centos-7
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: devstack-centos7
base-image: 'CentOS 7 (PVHVM)'
min-ram: 8192
@ -238,13 +246,21 @@ providers:
diskimage: fedora-23
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: centos-7
min-ram: 8192
diskimage: centos-7
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: devstack-centos7
base-image: 'CentOS 7 (PVHVM)'
min-ram: 8192
@ -300,13 +316,21 @@ providers:
diskimage: fedora-23
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: centos-7
min-ram: 8192
diskimage: centos-7
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: devstack-centos7
base-image: 'CentOS 7 (PVHVM)'
min-ram: 8192