1
=== modified file 'run/job-parts/osci_openstack_common.sh'
2
--- run/job-parts/osci_openstack_common.sh	2018-04-16 14:14:20 +0000
3
+++ run/job-parts/osci_openstack_common.sh	2018-07-12 13:21:20 +0000
4
@@ -291,9 +291,18 @@
5
291
}
291
}
6
292
292
7
293
293
8
294
function f_openstack_set_zaza_env_vars() {
9
295
    f_line $FUNCNAME
10
296
    export MODEL_SETTINGS="virt-type=kvm"
11
297
    echo "  + Setting zaza env vars:"
12
298
    echo "    MODEL_SETTINGS: $MODEL_SETTINGS"
13
299
}
14
300
15
301
16
294
function f_amulet_set_network_env_vars() {
302
function f_amulet_set_network_env_vars() {
17
295
    f_line $FUNCNAME
303
    f_line $FUNCNAME
18
296
    f_openstack_set_network_env_vars
304
    f_openstack_set_network_env_vars
19
305
    f_openstack_set_zaza_env_vars
20
297
}
306
}
21
298
307
22
299
308
Status:	Merged
Merged at revision:	401
Proposed branch:	lp:~gnuoy/ubuntu-openstack-ci/model-config
Merge into:	lp:ubuntu-openstack-ci
Diff against target:	20 lines (+9/-0) 1 file modified run/job-parts/osci_openstack_common.sh (+9/-0)
To merge this branch:	bzr merge lp:~gnuoy/ubuntu-openstack-ci/model-config
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ryan Beisner (community)		2018-07-12	Approve on 2018-07-12
Review via email: mp+349408@code.launchpad.net