ubuntu-openstack-ci

Merge lp:~gnuoy/ubuntu-openstack-ci/model-config into lp:ubuntu-openstack-ci

  1. model-config
  2. Merge into trunk
Proposed by Liam Young
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
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
Review via email: mp+349408@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 }
6
7
8+function f_openstack_set_zaza_env_vars() {
9+ f_line $FUNCNAME
10+ export MODEL_SETTINGS="virt-type=kvm"
11+ echo " + Setting zaza env vars:"
12+ echo " MODEL_SETTINGS: $MODEL_SETTINGS"
13+}
14+
15+
16 function f_amulet_set_network_env_vars() {
17 f_line $FUNCNAME
18 f_openstack_set_network_env_vars
19+ f_openstack_set_zaza_env_vars
20 }
21
22

Subscribers

People subscribed via source and target branches