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
Sort cron parameter into parameter section
[releng/builder.git]
/
openstack-hot
/
generic-server.yaml
diff --git
a/openstack-hot/generic-server.yaml
b/openstack-hot/generic-server.yaml
index 8242aa6464b56c765b29e4d16464d4b37311b594..f4cbb5cddf416214c37a02a1405aaae91a0b238b 100644
(file)
--- a/
openstack-hot/generic-server.yaml
+++ b/
openstack-hot/generic-server.yaml
@@
-26,18
+26,30
@@
parameters:
default: "0"
vm_flavor:
type: string
default: "0"
vm_flavor:
type: string
- default:
1 GB General Purpose v
1
+ default:
v1-standard-
1
description: OpenStack Flavor to use
vm_image:
type: string
description: VM Image to spin up
resources:
description: OpenStack Flavor to use
vm_image:
type: string
description: VM Image to spin up
resources:
+ port:
+ type: "OS::Neutron::Port"
+ properties:
+ 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:
flavor: {get_param: vm_flavor}
instance:
type: "OS::Nova::Server"
properties:
flavor: {get_param: vm_flavor}
- image: {get_param: vm_image}
+ 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
@@
-48,22
+60,22
@@
resources:
str_split:
- ' - '
- {get_param: vm_image}
str_split:
- ' - '
- {get_param: vm_image}
- -
1
+ -
2
"GROUP": {get_param: group}
"INDEX": {get_param: index}
networks:
"GROUP": {get_param: group}
"INDEX": {get_param: index}
networks:
- -
network: RC-ODL
+ -
port: {get_resource: port}
key_name: {get_param: ssh_key}
user_data: |
#!/bin/bash
key_name: {get_param: ssh_key}
user_data: |
#!/bin/bash
- until
ping -c1 git
.opendaylight.org &>/dev/null
+ until
host devvexx
.opendaylight.org &>/dev/null
do
do
- echo "Waiting until
git
.opendaylight.org is resolvable..."
+ echo "Waiting until
devvexx
.opendaylight.org is resolvable..."
done
done
- git clone
https://git.opendaylight.org/gerrit
/releng/builder /builder
+ git clone
git://devvexx.opendaylight.org/mirror
/releng/builder /builder
/builder/jenkins-scripts/jenkins-init-script.sh
outputs:
ip:
description: IP address of the instance
/builder/jenkins-scripts/jenkins-init-script.sh
outputs:
ip:
description: IP address of the instance
- value: {get_attr: [instance, networks,
RC-ODL
, 0]}
+ value: {get_attr: [instance, networks,
odlci
, 0]}