openstack
/
project-config
Code Issues Proposed changes

Merge "Drop template from diskimage names"

This commit is contained in:
Jenkins 2017-01-23 15:40:38 +00:00 committed by Gerrit Code Review
parent e0f324b0f7 56fc1a6ed3
commit 1e09fcbb20
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nodepool/nodepool.yaml
View File

@ -249,6 +249,7 @@ providers:
# Remove this when glean has support for ipv6 on centos
ipv6-preferred: false
image-type: vhd
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8192
@ -302,6 +303,7 @@ providers:
# Remove this when glean has support for ipv6 on centos
ipv6-preferred: false
image-type: vhd
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8192
@ -355,6 +357,7 @@ providers:
# Remove this when glean has support for ipv6 on centos
ipv6-preferred: false
image-type: vhd
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8192
@ -406,6 +409,7 @@ providers:
max-servers: 79
rate: 0.1
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -457,6 +461,7 @@ providers:
max-servers: 159
rate: 0.1
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -508,6 +513,7 @@ providers:
max-servers: 38
rate: 0.001
clean-floating-ips: true
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -558,6 +564,7 @@ providers:
boot-timeout: 120
max-servers: 150
rate: 0.001
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -611,6 +618,7 @@ providers:
ipv6-preferred: true
networks:
- name: 'GATEWAY_NET_V6'
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -664,6 +672,7 @@ providers:
ipv6-preferred: true
networks:
- name: 'GATEWAY_NET_V6'
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -717,6 +726,7 @@ providers:
ipv6-preferred: true
networks:
- name: 'GATEWAY_NET_V6'
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -769,6 +779,7 @@ providers:
clean-floating-ips: true
networks:
- net-label: private
template-hostname: '{image.name}-{timestamp}'
images:
- name: centos-7
min-ram: 6144
@ -786,6 +797,7 @@ providers:
clean-floating-ips: true
networks:
- net-label: private
template-hostname: '{image.name}-{timestamp}'
images:
- name: centos-7
min-ram: 6144
@ -802,6 +814,7 @@ providers:
max-servers: 126
rate: 0.25
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000
@ -853,6 +866,7 @@ providers:
max-servers: 100
rate: 0.25
image-type: 'qcow2'
template-hostname: '{image.name}-{timestamp}'
images:
- name: ubuntu-precise
min-ram: 8000