Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove builder docs carbon jobs
[releng/builder.git]
/
openstack-hot
/
generic-server.yaml
diff --git
a/openstack-hot/generic-server.yaml
b/openstack-hot/generic-server.yaml
index f4cbb5cddf416214c37a02a1405aaae91a0b238b..6fbab522c4999d80152f0b4c18029eabb5e00496 100644
(file)
--- a/
openstack-hot/generic-server.yaml
+++ b/
openstack-hot/generic-server.yaml
@@
-39,17
+39,11
@@
resources:
allowed_address_pairs:
- ip_address: 10.250.0.0/24
network: odlci
allowed_address_pairs:
- ip_address: 10.250.0.0/24
network: odlci
- volume:
- type: "OS::Cinder::Volume"
- properties:
- image: {get_param: vm_image}
- size: 40
instance:
type: "OS::Nova::Server"
properties:
instance:
type: "OS::Nova::Server"
properties:
+ image: {get_param: vm_image}
flavor: {get_param: vm_flavor}
flavor: {get_param: vm_flavor}
- block_device_mapping_v2:
- - volume_id: {get_resource: volume}
name:
str_replace:
template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
name:
str_replace:
template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX