Merge "Use correct flavors for centos7 and fedora23 in rax"
This commit is contained in:
commit
5784a6afda
@ -176,13 +176,21 @@ providers:
|
|||||||
diskimage: fedora-23
|
diskimage: fedora-23
|
||||||
username: jenkins
|
username: jenkins
|
||||||
private-key: /home/nodepool/.ssh/id_rsa
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
name-filter: 'Performance'
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
meta:
|
||||||
|
vm_mode: hvm
|
||||||
|
xenapi_use_agent: 'false'
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
diskimage: centos-7
|
diskimage: centos-7
|
||||||
username: jenkins
|
username: jenkins
|
||||||
private-key: /home/nodepool/.ssh/id_rsa
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
name-filter: 'Performance'
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
meta:
|
||||||
|
vm_mode: hvm
|
||||||
|
xenapi_use_agent: 'false'
|
||||||
- name: devstack-centos7
|
- name: devstack-centos7
|
||||||
base-image: 'CentOS 7 (PVHVM)'
|
base-image: 'CentOS 7 (PVHVM)'
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
@ -238,13 +246,21 @@ providers:
|
|||||||
diskimage: fedora-23
|
diskimage: fedora-23
|
||||||
username: jenkins
|
username: jenkins
|
||||||
private-key: /home/nodepool/.ssh/id_rsa
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
name-filter: 'Performance'
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
meta:
|
||||||
|
vm_mode: hvm
|
||||||
|
xenapi_use_agent: 'false'
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
diskimage: centos-7
|
diskimage: centos-7
|
||||||
username: jenkins
|
username: jenkins
|
||||||
private-key: /home/nodepool/.ssh/id_rsa
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
name-filter: 'Performance'
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
meta:
|
||||||
|
vm_mode: hvm
|
||||||
|
xenapi_use_agent: 'false'
|
||||||
- name: devstack-centos7
|
- name: devstack-centos7
|
||||||
base-image: 'CentOS 7 (PVHVM)'
|
base-image: 'CentOS 7 (PVHVM)'
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
@ -300,13 +316,21 @@ providers:
|
|||||||
diskimage: fedora-23
|
diskimage: fedora-23
|
||||||
username: jenkins
|
username: jenkins
|
||||||
private-key: /home/nodepool/.ssh/id_rsa
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
name-filter: 'Performance'
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
meta:
|
||||||
|
vm_mode: hvm
|
||||||
|
xenapi_use_agent: 'false'
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
diskimage: centos-7
|
diskimage: centos-7
|
||||||
username: jenkins
|
username: jenkins
|
||||||
private-key: /home/nodepool/.ssh/id_rsa
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
name-filter: 'Performance'
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
meta:
|
||||||
|
vm_mode: hvm
|
||||||
|
xenapi_use_agent: 'false'
|
||||||
- name: devstack-centos7
|
- name: devstack-centos7
|
||||||
base-image: 'CentOS 7 (PVHVM)'
|
base-image: 'CentOS 7 (PVHVM)'
|
||||||
min-ram: 8192
|
min-ram: 8192
|
||||||
|
Loading…
x
Reference in New Issue
Block a user