Remove meta cantrip from image upload params

os-client-config and shade have contained this as default values for
rackspace for quite some time. There is no need for us to set them
directly on every image in nodepool.yaml.

Change-Id: I134831daa7880778a1f4b9a2acbaed14a0a1d06a
This commit is contained in:
Monty Taylor 2016-11-14 12:11:44 -06:00
parent 41b846cab6
commit 994dcc1b20
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594

View File

@ -231,9 +231,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
@ -241,9 +238,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: ubuntu-xenial
min-ram: 8192
diskimage: ubuntu-xenial
@ -251,9 +245,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: debian-jessie
min-ram: 8192
diskimage: debian-jessie
@ -261,9 +252,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: fedora-23
min-ram: 8192
diskimage: fedora-23
@ -271,9 +259,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: fedora-24
min-ram: 8192
diskimage: fedora-24
@ -281,9 +266,6 @@ providers:
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
@ -291,9 +273,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: rax-ord
region-name: 'ORD'
cloud: rax
@ -310,9 +289,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
@ -320,9 +296,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: ubuntu-xenial
min-ram: 8192
diskimage: ubuntu-xenial
@ -330,9 +303,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: debian-jessie
min-ram: 8192
diskimage: debian-jessie
@ -340,9 +310,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: fedora-23
min-ram: 8192
diskimage: fedora-23
@ -350,9 +317,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: fedora-24
min-ram: 8192
diskimage: fedora-24
@ -360,9 +324,6 @@ providers:
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
@ -370,9 +331,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: rax-iad
region-name: 'IAD'
cloud: rax
@ -389,9 +347,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
@ -399,9 +354,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: ubuntu-xenial
min-ram: 8192
diskimage: ubuntu-xenial
@ -409,9 +361,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: debian-jessie
min-ram: 8192
diskimage: debian-jessie
@ -419,9 +368,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: fedora-23
min-ram: 8192
diskimage: fedora-23
@ -429,9 +375,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: fedora-24
min-ram: 8192
diskimage: fedora-24
@ -439,9 +382,6 @@ providers:
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
@ -449,9 +389,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
meta:
vm_mode: hvm
xenapi_use_agent: 'false'
- name: ovh-gra1
region-name: 'GRA1'
cloud: ovh