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
Merge "Use aggregated report for odlparent"
[releng/builder.git]
/
openstack-hot
/
apex-server.yaml
diff --git
a/openstack-hot/apex-server.yaml
b/openstack-hot/apex-server.yaml
index 0b7b86cd33fd64bcfda57c718e67d36c04ca7986..6a483c63e00729c59f969f113814a7787a162141 100644
(file)
--- a/
openstack-hot/apex-server.yaml
+++ b/
openstack-hot/apex-server.yaml
@@
-28,14
+28,11
@@
parameters:
vm_image:
type: string
description: VM Image to spin up
vm_image:
type: string
description: VM Image to spin up
+ vm_network:
+ type: string
+ description: VM network
resources:
resources:
- port:
- type: "OS::Neutron::Port"
- properties:
- allowed_address_pairs:
- - ip_address: 192.0.2.0/24
- network: APEX_192_network
instance:
type: "OS::Nova::Server"
properties:
instance:
type: "OS::Nova::Server"
properties:
@@
-55,4
+52,4
@@
resources:
"GROUP": {get_param: group}
"INDEX": {get_param: index}
networks:
"GROUP": {get_param: group}
"INDEX": {get_param: index}
networks:
- -
port: {get_resource: port
}
+ -
network: {get_param: vm_network
}