1 From: cristinapauna <cristina.pauna@enea.com>
2 Date: Fri, 25 Nov 2016 16:38:46 +0200
3 Subject: [PATCH] Fuel rework for multiple libvirt
5 The current fuel arhitecture assumes that all the VMs
6 (Jenkins slave, Fuel master and Target nodes) are all on
7 the same server. There is code that allows the Fuel master
8 to be on a different machine, but nothing for the Target nodes.
9 In Enea-Arm lab we have a different server for each.
11 This commit also adds specific templates for a virtual pod in
14 Therefore, the following changes are done:
15 - The default libvirt URI is the machine on which the Target nodes are
16 - The parameter libvirtUri was added in the dha.yaml file for fuel master
17 - All virsh calls have "-c" option to explicitly specify the uri; this parameter
18 is set only when libvirtUri is explicitly set in the yaml file
19 - The scenarios dha override now point to the arm template files
20 - The network templates are not needed for ARM, as the network infra is provided
21 by the server on which the Target node VMs reside; the folder is added here
23 - The target nodes are created with virsh rather than quemu when the nodes are
24 not on the same machine as Jenkins slave (similar logic to what is done for
27 Initially only ha scenarios were successfully deployed on virtual pods
28 The default configuration is for ha scenarios and those have 5 target nodes
29 while on the noha scenarios there are 4. The noha scenarios failed because
30 it was trying to parse one extra node.
32 The dea and dha files need to be modified for each noha scenario so that the
33 nodes are properly configured.
35 Signed-off-by: cristinapauna <cristina.pauna@enea.com>
37 deploy/dha_adapters/hardware_adapter.py | 5 ++
38 deploy/dha_adapters/libvirt_adapter.py | 42 ++++-----
39 deploy/environments/execution_environment.py | 19 +++--
40 deploy/environments/libvirt_environment.py | 59 ++++++++++++-
41 deploy/environments/virtual_fuel.py | 8 +-
42 deploy/install_fuel_master.py | 2 +-
43 deploy/scenario/ha_heat_ceilometer_scenario.yaml | 13 +--
44 .../ha_nfv-kvm_heat_ceilometer_scenario.yaml | 13 +--
45 .../ha_nfv-ovs_heat_ceilometer_scenario.yaml | 13 +--
46 deploy/scenario/ha_odl-bgpvpn_scenario.yaml | 13 +--
47 .../ha_odl-l2_heat_ceilometer_scenario.yaml | 13 +--
48 .../ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 13 +--
49 .../ha_odl-l3_heat_ceilometer_scenario.yaml | 13 +--
50 ...ha_onos_nofeature_heat_ceilometer_scenario.yaml | 13 +--
51 .../ha_onos_sfc_heat_ceilometer_scenario.yaml | 13 +--
52 .../scenario/ha_vlan_heat_ceilometer_scenario.yaml | 13 +--
53 .../scenario/no-ha_heat_ceilometer_scenario.yaml | 25 ++++++
54 .../no-ha_nfv-kvm_heat_ceilometer_scenario.yaml | 25 ++++++
55 ...a_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml | 25 ++++++
56 .../no-ha_nfv-ovs_heat_ceilometer_scenario.yaml | 26 +++++-
57 deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml | 25 ++++++
58 .../no-ha_odl-l2_heat_ceilometer_scenario.yaml | 25 ++++++
59 .../no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 25 ++++++
60 .../no-ha_odl-l3_heat_ceilometer_scenario.yaml | 25 ++++++
61 ...ha_onos_nofeature_heat_ceilometer_scenario.yaml | 26 ++++++
62 .../no-ha_onos_sfc_heat_ceilometer_scenario.yaml | 25 ++++++
63 .../no-ha_vlan_heat_ceilometer_scenario.yaml | 25 ++++++
64 .../arm/virtual_environment/networks/.gitkeep | 0
65 .../arm/virtual_environment/vms/compute.xml | 57 +++++++++++++
66 .../arm/virtual_environment/vms/controller.xml | 57 +++++++++++++
67 .../templates/arm/virtual_environment/vms/fuel.xml | 99 ++++++++++++++++++++++
68 31 files changed, 658 insertions(+), 97 deletions(-)
69 create mode 100644 deploy/templates/arm/virtual_environment/networks/.gitkeep
70 create mode 100644 deploy/templates/arm/virtual_environment/vms/compute.xml
71 create mode 100644 deploy/templates/arm/virtual_environment/vms/controller.xml
72 create mode 100644 deploy/templates/arm/virtual_environment/vms/fuel.xml
74 diff --git a/deploy/dha_adapters/hardware_adapter.py b/deploy/dha_adapters/hardware_adapter.py
75 index aa59581..cf3d77a 100644
76 --- a/deploy/dha_adapters/hardware_adapter.py
77 +++ b/deploy/dha_adapters/hardware_adapter.py
78 @@ -63,3 +63,8 @@ class HardwareAdapter(object):
79 vm_definition = self.dha_struct.get('define_vms')
81 return vm_definition.get(role)
82 + def get_node_uri(self, node_id):
83 + vm_libvirt_uri = self.get_node_property(node_id, 'libvirtUri')
85 + return '-c %s' % vm_libvirt_uri
87 diff --git a/deploy/dha_adapters/libvirt_adapter.py b/deploy/dha_adapters/libvirt_adapter.py
88 index a00f091..34535d1 100644
89 --- a/deploy/dha_adapters/libvirt_adapter.py
90 +++ b/deploy/dha_adapters/libvirt_adapter.py
91 @@ -43,21 +43,21 @@ class LibvirtAdapter(HardwareAdapter):
92 def node_power_off(self, node_id):
93 vm_name = self.get_node_property(node_id, 'libvirtName')
94 log('Power OFF Node %s' % vm_name)
95 - state = exec_cmd('virsh domstate %s' % vm_name)
96 + state = exec_cmd('virsh %s domstate %s' % (self.get_node_uri(node_id), vm_name))
97 if state == 'running':
98 - exec_cmd('virsh destroy %s' % vm_name, False)
99 + exec_cmd('virsh %s destroy %s' % (self.get_node_uri(node_id), vm_name), False)
101 def node_power_on(self, node_id):
102 vm_name = self.get_node_property(node_id, 'libvirtName')
103 log('Power ON Node %s' % vm_name)
104 - state = exec_cmd('virsh domstate %s' % vm_name)
105 + state = exec_cmd('virsh %s domstate %s' % (self.get_node_uri(node_id), vm_name))
106 if state == 'shut off':
107 - exec_cmd('virsh start %s' % vm_name)
108 + exec_cmd('virsh %s start %s' % (self.get_node_uri(node_id), vm_name))
110 def node_reset(self, node_id):
111 vm_name = self.get_node_property(node_id, 'libvirtName')
112 log('Reset Node %s' % vm_name)
113 - exec_cmd('virsh reset %s' % vm_name)
114 + exec_cmd('virsh %s reset %s' % (self.get_node_uri(node_id), vm_name))
116 def translate(self, boot_order_list):
118 @@ -73,7 +73,7 @@ class LibvirtAdapter(HardwareAdapter):
119 vm_name = self.get_node_property(node_id, 'libvirtName')
120 temp_dir = tempfile.mkdtemp()
121 log('Set boot order %s on Node %s' % (boot_order_list, vm_name))
122 - resp = exec_cmd('virsh dumpxml %s' % vm_name)
123 + resp = exec_cmd('virsh %s dumpxml %s' % (self.get_node_uri(node_id), vm_name))
124 xml_dump = etree.fromstring(resp, self.parser)
125 os = xml_dump.xpath('/domain/os')
127 @@ -92,12 +92,12 @@ class LibvirtAdapter(HardwareAdapter):
128 xml_file = temp_dir + '/%s.xml' % vm_name
129 with open(xml_file, 'w') as f:
130 tree.write(f, pretty_print=True, xml_declaration=True)
131 - exec_cmd('virsh define %s' % xml_file)
132 + exec_cmd('virsh %s define %s' % (self.get_node_uri(node_id), xml_file))
135 def node_zero_mbr(self, node_id):
136 vm_name = self.get_node_property(node_id, 'libvirtName')
137 - resp = exec_cmd('virsh dumpxml %s' % vm_name)
138 + resp = exec_cmd('virsh %s dumpxml %s' % (self.get_node_uri(node_id), vm_name))
139 xml_dump = etree.fromstring(resp)
140 disks = xml_dump.xpath('/domain/devices/disk')
142 @@ -114,20 +114,20 @@ class LibvirtAdapter(HardwareAdapter):
144 def node_eject_iso(self, node_id):
145 vm_name = self.get_node_property(node_id, 'libvirtName')
146 - device = self.get_name_of_device(vm_name, 'cdrom')
147 - exec_cmd('virsh change-media %s --eject %s --config --live'
148 - % (vm_name, device), False)
149 + device = self.get_name_of_device(vm_name, 'cdrom', node_id)
150 + exec_cmd('virsh %s change-media %s --eject %s --config --live'
151 + % (self.get_node_uri(node_id), vm_name, device), False)
153 def node_insert_iso(self, node_id, iso_file):
154 vm_name = self.get_node_property(node_id, 'libvirtName')
155 - device = self.get_name_of_device(vm_name, 'cdrom')
156 - exec_cmd('virsh change-media %s --insert %s %s'
157 - % (vm_name, device, iso_file))
158 + device = self.get_name_of_device(vm_name, 'cdrom', node_id)
159 + exec_cmd('virsh %s change-media %s --insert %s %s'
160 + % (self.get_node_uri(node_id), vm_name, device, iso_file))
162 def get_node_pxe_mac(self, node_id):
164 vm_name = self.get_node_property(node_id, 'libvirtName')
165 - resp = exec_cmd('virsh dumpxml %s' % vm_name)
166 + resp = exec_cmd('virsh %s dumpxml %s' % (self.get_node_uri(node_id), vm_name))
167 xml_dump = etree.fromstring(resp)
168 interfaces = xml_dump.xpath('/domain/devices/interface')
169 for interface in interfaces:
170 @@ -136,8 +136,8 @@ class LibvirtAdapter(HardwareAdapter):
171 mac_list.append(mac.get('address').lower())
174 - def get_name_of_device(self, vm_name, device_type):
175 - resp = exec_cmd('virsh dumpxml %s' % vm_name)
176 + def get_name_of_device(self, vm_name, device_type, node_id):
177 + resp = exec_cmd('virsh %s dumpxml %s' % (self.get_node_uri(node_id), vm_name))
178 xml_dump = etree.fromstring(resp)
179 disks = xml_dump.xpath('/domain/devices/disk')
181 @@ -151,7 +151,7 @@ class LibvirtAdapter(HardwareAdapter):
182 def get_virt_net_conf_dir(self):
183 return self.dha_struct['virtNetConfDir']
185 - def upload_iso(self, iso_file):
186 + def upload_iso(self, node_id, iso_file):
187 size = os.path.getsize(iso_file)
188 vol_name = os.path.basename(iso_file)
189 vol_xml = VOL_XML_TEMPLATE.format(name=vol_name, unit='bytes',
190 @@ -162,10 +162,10 @@ class LibvirtAdapter(HardwareAdapter):
193 pool = DEFAULT_POOL # FIXME
194 - exec_cmd('virsh vol-create --pool %s %s' % (pool, fname))
195 - vol_path = exec_cmd('virsh vol-path --pool %s %s' % (pool, vol_name))
196 + exec_cmd('virsh %s vol-create --pool %s %s' % (self.get_node_uri(node_id), pool, fname))
197 + vol_path = exec_cmd('virsh %s vol-path --pool %s %s' % (self.get_node_uri(node_id), pool, vol_name))
199 - exec_cmd('virsh vol-upload %s %s' % (vol_path, iso_file),
200 + exec_cmd('virsh %s vol-upload %s %s' % (self.get_node_uri(node_id), vol_path, iso_file),
201 attempts=5, delay=10, verbose=True)
204 diff --git a/deploy/environments/execution_environment.py b/deploy/environments/execution_environment.py
205 index 7a0b474..db25229 100644
206 --- a/deploy/environments/execution_environment.py
207 +++ b/deploy/environments/execution_environment.py
208 @@ -29,12 +29,12 @@ class ExecutionEnvironment(object):
210 def delete_vm(self, node_id):
211 vm_name = self.dha.get_node_property(node_id, 'libvirtName')
212 - r, c = exec_cmd('virsh dumpxml %s' % vm_name, False)
213 + r, c = exec_cmd('virsh %s dumpxml %s' % (self.dha.get_node_uri(node_id), vm_name), False)
216 - self.undefine_vm_delete_disk(r, vm_name)
217 + self.undefine_vm_delete_disk(r, vm_name, node_id)
219 - def undefine_vm_delete_disk(self, printout, vm_name):
220 + def undefine_vm_delete_disk(self, printout, vm_name, node_id):
222 xml_dump = etree.fromstring(printout, self.parser)
223 disks = xml_dump.xpath('/domain/devices/disk')
224 @@ -45,8 +45,13 @@ class ExecutionEnvironment(object):
226 disk_files.append(source_file)
227 log('Deleting VM %s with disks %s' % (vm_name, disk_files))
228 - exec_cmd('virsh destroy %s' % vm_name, False)
229 - exec_cmd('virsh undefine --managed-save --remove-all-storage %s' % vm_name, False)
230 + exec_cmd('virsh %s destroy %s' % (self.dha.get_node_uri(node_id), vm_name), False)
231 + r, c = exec_cmd('virsh %s undefine --managed-save --remove-all-storage %s' %
232 + (self.dha.get_node_uri(node_id), vm_name), False)
234 + exec_cmd('virsh %s undefine --managed-save --remove-all-storage --nvram %s' %
235 + (self.dha.get_node_uri(node_id), vm_name), False)
237 for file in disk_files:
240 @@ -75,7 +80,7 @@ class ExecutionEnvironment(object):
241 self.overwrite_xml(xml_element, value)
243 def define_vm(self, vm_name, temp_vm_file, disk_path,
244 - vm_definition_overwrite):
245 + vm_definition_overwrite, node_id):
246 log('Creating VM %s with disks %s' % (vm_name, disk_path))
247 with open(temp_vm_file) as f:
248 vm_xml = etree.parse(f)
249 @@ -99,4 +104,4 @@ class ExecutionEnvironment(object):
251 with open(temp_vm_file, 'w') as f:
252 vm_xml.write(f, pretty_print=True, xml_declaration=True)
253 - exec_cmd('virsh define %s' % temp_vm_file)
254 + exec_cmd('virsh %s define %s' % (self.dha.get_node_uri(node_id), temp_vm_file))
255 diff --git a/deploy/environments/libvirt_environment.py b/deploy/environments/libvirt_environment.py
256 index 07a47fd..08d669b 100644
257 --- a/deploy/environments/libvirt_environment.py
258 +++ b/deploy/environments/libvirt_environment.py
259 @@ -12,6 +12,9 @@ from lxml import etree
261 from execution_environment import ExecutionEnvironment
269 @@ -21,6 +24,25 @@ from common import (
273 +VOL_XML_TEMPLATE = '''<volume type='file'>
274 + <name>{name}</name>
275 + <capacity unit='{unit}'>{size!s}</capacity>
277 + <format type='{format_type}'/>
281 +DEFAULT_POOL = 'jenkins'
283 +def get_size_and_unit(s):
284 + p = re.compile('^(\d+)\s*(\D+)')
288 + size = m.groups()[0]
289 + unit = m.groups()[1]
293 class LibvirtEnvironment(ExecutionEnvironment):
295 @@ -33,10 +55,39 @@ class LibvirtEnvironment(ExecutionEnvironment):
296 self.node_ids = self.dha.get_all_node_ids()
297 self.net_names = self.collect_net_names()
299 - def create_storage(self, node_id, disk_path, disk_sizes):
300 + def create_volume(self, pool, name, su, node_id, temp_dir, img_type='raw'):
301 + log('Creating image using Libvirt volumes in pool %s, name: %s, uri: %s' %
302 + (pool, name, self.dha.get_node_uri(node_id)))
303 + size, unit = get_size_and_unit(su)
305 + err('Could not determine size and unit of %s' % s)
307 + vol_xml = VOL_XML_TEMPLATE.format(name=name, unit=unit, size=size,
308 + format_type=img_type)
309 + fname = os.path.join(temp_dir, '%s_vol.xml' % name)
310 + with file(fname, 'w') as f:
313 + exec_cmd('virsh %s vol-create --pool %s %s' %
314 + (self.dha.get_node_uri(node_id), pool, fname))
315 + vol_path = exec_cmd('virsh %s vol-path --pool %s %s' %
316 + (self.dha.get_node_uri(node_id), pool, name))
322 + def create_storage(self, node_id, disk_path, disk_sizes, temp_dir):
323 role = self.dea.get_node_main_role(node_id, self.fuel_node_id)
324 disk_size = disk_sizes[role]
325 - exec_cmd('qemu-img create -f raw %s %s' % (disk_path, disk_size))
326 + if os.environ.get('LIBVIRT_DEFAULT_URI') == None:
327 + exec_cmd('qemu-img create -f raw %s %s' % (disk_path, disk_size))
329 + pool = DEFAULT_POOL # FIXME
330 + name = os.path.basename(disk_path)
331 + disk_path = self.create_volume(pool, name, disk_size, node_id, temp_dir)
335 def create_vms(self):
336 temp_dir = tempfile.mkdtemp()
337 @@ -48,13 +99,13 @@ class LibvirtEnvironment(ExecutionEnvironment):
338 node_id, 'libvirtTemplate'))
339 check_file_exists(vm_template)
340 disk_path = '%s/%s.raw' % (self.storage_dir, vm_name)
341 - self.create_storage(node_id, disk_path, disk_sizes)
342 + disk_path = self.create_storage(node_id, disk_path, disk_sizes, temp_dir)
343 temp_vm_file = '%s/%s' % (temp_dir, vm_name)
344 exec_cmd('cp %s %s' % (vm_template, temp_vm_file))
345 vm_definition_overwrite = self.dha.get_vm_definition(
346 self.dea.get_node_main_role(node_id, self.fuel_node_id))
347 self.define_vm(vm_name, temp_vm_file, disk_path,
348 - vm_definition_overwrite)
349 + vm_definition_overwrite, node_id)
353 diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
354 index fcfa532..5f50f40 100644
355 --- a/deploy/environments/virtual_fuel.py
356 +++ b/deploy/environments/virtual_fuel.py
357 @@ -99,8 +99,10 @@ class VirtualFuel(ExecutionEnvironment):
358 with file(fname, 'w') as f:
361 - exec_cmd('virsh vol-create --pool %s %s' % (pool, fname))
362 - vol_path = exec_cmd('virsh vol-path --pool %s %s' % (pool, name))
363 + exec_cmd('virsh %s vol-create --pool %s %s' %
364 + (self.dha.get_node_uri(self.fuel_node_id), pool, fname))
365 + vol_path = exec_cmd('virsh %s vol-path --pool %s %s' %
366 + (self.dha.get_node_uri(self.fuel_node_id), pool, name))
370 @@ -131,7 +133,7 @@ class VirtualFuel(ExecutionEnvironment):
371 vm_definition_overwrite = self.dha.get_vm_definition('fuel')
373 self.define_vm(self.vm_name, self.temp_vm_file, disk_path,
374 - vm_definition_overwrite)
375 + vm_definition_overwrite, self.fuel_node_id)
377 def setup_environment(self):
378 self.cleanup_environment()
379 diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py
380 index 2d89c8e..2615818 100644
381 --- a/deploy/install_fuel_master.py
382 +++ b/deploy/install_fuel_master.py
383 @@ -59,7 +59,7 @@ class InstallFuelMaster(object):
385 if os.environ.get('LIBVIRT_DEFAULT_URI'):
386 log('Upload ISO to pool')
387 - self.iso_file = self.dha.upload_iso(self.iso_file)
388 + self.iso_file = self.dha.upload_iso(self.fuel_node_id, self.iso_file)
391 self.dha.node_zero_mbr(self.fuel_node_id)
392 diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
393 index 4051c47..78fa80d 100644
394 --- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml
395 +++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
396 @@ -58,22 +58,23 @@ dha-override-config:
399 libvirtName: controller1
400 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
401 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
403 libvirtName: controller2
404 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
405 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
407 libvirtName: controller3
408 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
409 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
411 libvirtName: compute1
412 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
413 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
415 libvirtName: compute2
416 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
417 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
419 libvirtName: fuel-master
420 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
421 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
422 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
426 diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
427 index 1217f72..bcdda61 100644
428 --- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
429 +++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
430 @@ -145,22 +145,23 @@ dha-override-config:
433 libvirtName: controller1
434 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
435 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
437 libvirtName: controller2
438 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
439 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
441 libvirtName: controller3
442 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
443 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
445 libvirtName: compute1
446 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
447 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
449 libvirtName: compute2
450 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
451 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
453 libvirtName: fuel-master
454 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
455 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
456 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
460 diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
461 index 51deb4e..bee2d1a 100644
462 --- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
463 +++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
464 @@ -107,22 +107,23 @@ dha-override-config:
467 libvirtName: controller1
468 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
469 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
471 libvirtName: controller2
472 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
473 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
475 libvirtName: controller3
476 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
477 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
479 libvirtName: compute1
480 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
481 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
483 libvirtName: compute2
484 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
485 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
487 libvirtName: fuel-master
488 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
489 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
490 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
494 diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
495 index 7d52e77..46efc4b 100644
496 --- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
497 +++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
498 @@ -77,22 +77,23 @@ dha-override-config:
501 libvirtName: controller1
502 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
503 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
505 libvirtName: controller2
506 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
507 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
509 libvirtName: controller3
510 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
511 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
513 libvirtName: compute1
514 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
515 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
517 libvirtName: compute2
518 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
519 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
521 libvirtName: fuel-master
522 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
523 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
524 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
528 diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
529 index 90c89ae..50dde30 100644
530 --- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
531 +++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
532 @@ -77,22 +77,23 @@ dha-override-config:
535 libvirtName: controller1
536 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
537 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
539 libvirtName: controller2
540 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
541 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
543 libvirtName: controller3
544 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
545 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
547 libvirtName: compute1
548 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
549 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
551 libvirtName: compute2
552 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
553 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
555 libvirtName: fuel-master
556 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
557 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
558 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
562 diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
563 index c478948..e20ec1a 100644
564 --- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
565 +++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
566 @@ -95,22 +95,23 @@ dha-override-config:
569 libvirtName: controller1
570 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
571 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
573 libvirtName: controller2
574 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
575 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
577 libvirtName: controller3
578 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
579 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
581 libvirtName: compute1
582 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
583 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
585 libvirtName: compute2
586 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
587 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
589 libvirtName: fuel-master
590 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
591 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
592 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
596 diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
597 index 967e7d2..322dd27 100644
598 --- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
599 +++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
600 @@ -93,22 +93,23 @@ dha-override-config:
603 libvirtName: controller1
604 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
605 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
607 libvirtName: controller2
608 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
609 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
611 libvirtName: controller3
612 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
613 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
615 libvirtName: compute1
616 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
617 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
619 libvirtName: compute2
620 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
621 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
623 libvirtName: fuel-master
624 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
625 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
626 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
630 diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
631 index f813458..88b8f6b 100644
632 --- a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
633 +++ b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
634 @@ -88,22 +88,23 @@ dha-override-config:
637 libvirtName: controller1
638 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
639 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
641 libvirtName: controller2
642 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
643 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
645 libvirtName: controller3
646 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
647 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
649 libvirtName: compute1
650 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
651 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
653 libvirtName: compute2
654 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
655 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
657 libvirtName: fuel-master
658 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
659 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
660 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
664 diff --git a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
665 index 32fbfcf..c390172 100644
666 --- a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
667 +++ b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
668 @@ -68,22 +68,23 @@ dha-override-config:
671 libvirtName: controller1
672 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
673 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
675 libvirtName: controller2
676 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
677 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
679 libvirtName: controller3
680 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
681 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
683 libvirtName: compute1
684 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
685 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
687 libvirtName: compute2
688 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
689 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
691 libvirtName: fuel-master
692 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
693 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
694 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
698 diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
699 index d1d5191..65b8b20 100644
700 --- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
701 +++ b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
702 @@ -102,22 +102,23 @@ dha-override-config:
705 libvirtName: controller1
706 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
707 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
709 libvirtName: controller2
710 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
711 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
713 libvirtName: controller3
714 - libvirtTemplate: templates/virtual_environment/vms/controller.xml
715 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
717 libvirtName: compute1
718 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
719 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
721 libvirtName: compute2
722 - libvirtTemplate: templates/virtual_environment/vms/compute.xml
723 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
725 libvirtName: fuel-master
726 - libvirtTemplate: templates/virtual_environment/vms/fuel.xml
727 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
728 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
732 diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
733 index 3dd5f84..d738154 100644
734 --- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
735 +++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
736 @@ -41,17 +41,42 @@ dea-override-config:
738 interfaces: interfaces_1
739 role: mongo,controller
740 + transformations: transformations_1
742 interfaces: interfaces_1
743 role: ceph-osd,compute
744 + transformations: transformations_2
746 interfaces: interfaces_1
747 role: ceph-osd,compute
748 + transformations: transformations_2
750 interfaces: interfaces_1
751 role: ceph-osd,compute
752 + transformations: transformations_2
757 + libvirtName: controller1
758 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
760 + libvirtName: compute1
761 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
763 + libvirtName: compute2
764 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
766 + libvirtName: compute3
767 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
769 + libvirtName: fuel-master
770 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
771 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
779 diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
780 index 4661a26..7ade095 100644
781 --- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
782 +++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
783 @@ -48,15 +48,19 @@ dea-override-config:
785 interfaces: interfaces_1
786 role: mongo,controller
787 + transformations: transformations_1
789 interfaces: interfaces_1
791 + transformations: transformations_2
793 interfaces: interfaces_1
795 + transformations: transformations_2
797 interfaces: interfaces_1
799 + transformations: transformations_2
803 @@ -141,6 +145,27 @@ dea-override-config:
809 + libvirtName: controller1
810 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
812 + libvirtName: compute1
813 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
815 + libvirtName: compute2
816 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
818 + libvirtName: compute3
819 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
821 + libvirtName: fuel-master
822 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
823 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
831 diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
832 index 87364e8..a3f0864 100644
833 --- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
834 +++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
835 @@ -55,15 +55,19 @@ dea-override-config:
837 interfaces: interfaces_1
838 role: mongo,controller
839 + transformations: transformations_1
841 interfaces: interfaces_1
842 role: ceph-osd,compute
843 + transformations: transformations_2
845 interfaces: interfaces_1
846 role: ceph-osd,compute
847 + transformations: transformations_2
849 interfaces: interfaces_1
850 role: ceph-osd,compute
851 + transformations: transformations_2
854 additional_components:
855 @@ -104,6 +108,27 @@ dea-override-config:
861 + libvirtName: controller1
862 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
864 + libvirtName: compute1
865 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
867 + libvirtName: compute2
868 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
870 + libvirtName: compute3
871 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
873 + libvirtName: fuel-master
874 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
875 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
883 diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
884 index 7ab76cb..f4e0adc 100644
885 --- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
886 +++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
887 @@ -56,19 +56,22 @@ dea-override-config:
889 interfaces: interfaces_vlan
890 role: mongo,controller
891 + transformations: transformations_1
893 interfaces: interfaces_dpdk
894 role: ceph-osd,compute
895 attributes: attributes_1
896 + transformations: transformations_2
898 interfaces: interfaces_dpdk
899 role: ceph-osd,compute
900 attributes: attributes_1
901 + transformations: transformations_2
903 interfaces: interfaces_dpdk
904 role: ceph-osd,compute
905 attributes: attributes_1
907 + transformations: transformations_2
911 @@ -102,6 +105,27 @@ dea-override-config:
917 + libvirtName: controller1
918 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
920 + libvirtName: compute1
921 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
923 + libvirtName: compute2
924 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
926 + libvirtName: compute3
927 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
929 + libvirtName: fuel-master
930 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
931 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
939 diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
940 index 6f21ea2..e92a741 100644
941 --- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
942 +++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
943 @@ -60,17 +60,42 @@ dea-override-config:
945 interfaces: interfaces_1
946 role: mongo,controller
947 + transformations: transformations_1
949 interfaces: interfaces_1
950 role: ceph-osd,opendaylight
951 + transformations: transformations_2
953 interfaces: interfaces_1
954 role: ceph-osd,compute
955 + transformations: transformations_2
957 interfaces: interfaces_1
958 role: ceph-osd,compute
959 + transformations: transformations_2
964 + libvirtName: controller1
965 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
967 + libvirtName: compute1
968 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
970 + libvirtName: compute2
971 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
973 + libvirtName: compute3
974 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
976 + libvirtName: fuel-master
977 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
978 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
986 diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
987 index f8787d7..1efa89a 100644
988 --- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
989 +++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
990 @@ -61,17 +61,42 @@ dea-override-config:
992 interfaces: interfaces_1
993 role: mongo,controller
994 + transformations: transformations_1
996 interfaces: interfaces_1
997 role: ceph-osd,opendaylight
998 + transformations: transformations_2
1000 interfaces: interfaces_1
1001 role: ceph-osd,compute
1002 + transformations: transformations_2
1004 interfaces: interfaces_1
1005 role: ceph-osd,compute
1006 + transformations: transformations_2
1008 dha-override-config:
1011 + libvirtName: controller1
1012 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
1014 + libvirtName: compute1
1015 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1017 + libvirtName: compute2
1018 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1020 + libvirtName: compute3
1021 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1023 + libvirtName: fuel-master
1024 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
1025 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
1033 diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
1034 index 90a45d5..b1fe773 100644
1035 --- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
1036 +++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
1037 @@ -80,17 +80,42 @@ dea-override-config:
1039 interfaces: interfaces_1
1040 role: mongo,controller,tacker
1041 + transformations: transformations_1
1043 interfaces: interfaces_1
1044 role: ceph-osd,opendaylight
1045 + transformations: transformations_2
1047 interfaces: interfaces_1
1048 role: ceph-osd,compute
1049 + transformations: transformations_2
1051 interfaces: interfaces_1
1052 role: ceph-osd,compute
1053 + transformations: transformations_2
1055 dha-override-config:
1058 + libvirtName: controller1
1059 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
1061 + libvirtName: compute1
1062 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1064 + libvirtName: compute2
1065 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1067 + libvirtName: compute3
1068 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1070 + libvirtName: fuel-master
1071 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
1072 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
1080 diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
1081 index 0c8415f..b59a049 100644
1082 --- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
1083 +++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
1084 @@ -71,15 +71,19 @@ dea-override-config:
1086 interfaces: interfaces_1
1087 role: mongo,controller
1088 + transformations: transformations_1
1090 interfaces: interfaces_1
1091 role: ceph-osd,opendaylight
1092 + transformations: transformations_2
1094 interfaces: interfaces_1
1095 role: ceph-osd,compute
1096 + transformations: transformations_2
1098 interfaces: interfaces_1
1099 role: ceph-osd,compute
1100 + transformations: transformations_2
1103 public_network_assignment:
1104 @@ -87,6 +91,27 @@ dea-override-config:
1107 dha-override-config:
1110 + libvirtName: controller1
1111 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
1113 + libvirtName: compute1
1114 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1116 + libvirtName: compute2
1117 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1119 + libvirtName: compute3
1120 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1122 + libvirtName: fuel-master
1123 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
1124 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
1132 diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
1133 index f5c00f0..e51dd56 100644
1134 --- a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
1135 +++ b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
1136 @@ -68,21 +68,47 @@ dea-override-config:
1138 interfaces: interfaces_1
1139 role: mongo,controller,onos
1140 + transformations: transformations_1
1142 interfaces: interfaces_1
1143 role: ceph-osd,compute
1144 + transformations: transformations_2
1146 interfaces: interfaces_1
1147 role: ceph-osd,compute
1148 + transformations: transformations_2
1150 interfaces: interfaces_1
1151 role: ceph-osd,compute
1152 + transformations: transformations_2
1155 public_network_assignment:
1156 assign_to_all_nodes:
1159 dha-override-config:
1162 + libvirtName: controller1
1163 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
1165 + libvirtName: compute1
1166 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1168 + libvirtName: compute2
1169 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1171 + libvirtName: compute3
1172 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1174 + libvirtName: fuel-master
1175 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
1176 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
1184 diff --git a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
1185 index 587346e..21a2be2 100644
1186 --- a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
1187 +++ b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
1188 @@ -48,21 +48,46 @@ dea-override-config:
1190 interfaces: interfaces_1
1191 role: mongo,controller,onos
1192 + transformations: transformations_1
1194 interfaces: interfaces_1
1195 role: ceph-osd,compute
1196 + transformations: transformations_2
1198 interfaces: interfaces_1
1199 role: ceph-osd,compute
1200 + transformations: transformations_2
1202 interfaces: interfaces_1
1203 role: ceph-osd,compute
1204 + transformations: transformations_2
1207 public_network_assignment:
1208 assign_to_all_nodes:
1210 dha-override-config:
1213 + libvirtName: controller1
1214 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
1216 + libvirtName: compute1
1217 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1219 + libvirtName: compute2
1220 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1222 + libvirtName: compute3
1223 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1225 + libvirtName: fuel-master
1226 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
1227 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
1235 diff --git a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
1236 index 567ea98..ada5b7e 100644
1237 --- a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
1238 +++ b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
1239 @@ -45,15 +45,19 @@ dea-override-config:
1241 interfaces: interfaces_1
1242 role: mongo,controller
1243 + transformations: transformations_1
1245 interfaces: interfaces_1
1246 role: ceph-osd,compute
1247 + transformations: transformations_2
1249 interfaces: interfaces_1
1250 role: ceph-osd,compute
1251 + transformations: transformations_2
1253 interfaces: interfaces_1
1254 role: ceph-osd,compute
1255 + transformations: transformations_2
1258 additional_components:
1259 @@ -94,6 +98,27 @@ dea-override-config:
1262 dha-override-config:
1265 + libvirtName: controller1
1266 + libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
1268 + libvirtName: compute1
1269 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1271 + libvirtName: compute2
1272 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1274 + libvirtName: compute3
1275 + libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
1277 + libvirtName: fuel-master
1278 + libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
1279 + libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
1284 # These overrides only take effect for virtual deployment scenarios
1286 ##############################################################################
1287 diff --git a/deploy/templates/arm/virtual_environment/networks/.gitkeep b/deploy/templates/arm/virtual_environment/networks/.gitkeep
1288 new file mode 100644
1289 index 0000000..e69de29
1290 diff --git a/deploy/templates/arm/virtual_environment/vms/compute.xml b/deploy/templates/arm/virtual_environment/vms/compute.xml
1291 new file mode 100644
1292 index 0000000..db3ba29
1294 +++ b/deploy/templates/arm/virtual_environment/vms/compute.xml
1296 +<domain type='kvm'>
1297 + <name>compute</name>
1298 + <memory unit='KiB'>8392704</memory>
1299 + <currentMemory unit='KiB'>8392704</currentMemory>
1300 + <vcpu placement='static'>6</vcpu>
1302 + <type arch='aarch64' machine='virt-2.6'>hvm</type>
1303 + <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
1306 + <gic version='3'/>
1308 + <cpu mode='host-model'>
1309 + <model fallback='allow'/>
1311 + <clock offset='utc'/>
1312 + <on_poweroff>destroy</on_poweroff>
1313 + <on_reboot>restart</on_reboot>
1314 + <on_crash>restart</on_crash>
1316 + <emulator>/usr/bin/kvm</emulator>
1317 + <disk type='file' device='disk'>
1318 + <driver name='qemu' type='raw' cache='none' io='native'/>
1319 + <source file='disk.raw'/>
1320 + <target dev='vda' bus='virtio'/>
1322 + <address type='virtio-mmio'/>
1324 + <controller type='scsi' index='0' model='virtio-scsi'>
1325 + <address type='virtio-mmio'/>
1327 + <controller type='pci' index='0' model='pcie-root'/>
1328 + <interface type='bridge'>
1329 + <source bridge='admin8_br'/>
1330 + <model type='virtio'/>
1332 + <address type='virtio-mmio'/>
1334 + <interface type='bridge'>
1335 + <source bridge='public8_br'/>
1336 + <model type='virtio'/>
1337 + <address type='virtio-mmio'/>
1339 + <interface type='bridge'>
1340 + <source bridge='trunk8_br'/>
1341 + <model type='virtio'/>
1342 + <address type='virtio-mmio'/>
1344 + <serial type='pty'>
1345 + <target port='0'/>
1347 + <console type='pty'>
1348 + <target type='serial' port='0'/>
1353 diff --git a/deploy/templates/arm/virtual_environment/vms/controller.xml b/deploy/templates/arm/virtual_environment/vms/controller.xml
1354 new file mode 100644
1355 index 0000000..6bd0385
1357 +++ b/deploy/templates/arm/virtual_environment/vms/controller.xml
1359 +<domain type='kvm'>
1360 + <name>controller</name>
1361 + <memory unit='KiB'>8392704</memory>
1362 + <currentMemory unit='KiB'>8392704</currentMemory>
1363 + <vcpu placement='static'>6</vcpu>
1365 + <type arch='aarch64' machine='virt-2.6'>hvm</type>
1366 + <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
1369 + <gic version='3'/>
1371 + <cpu mode='host-model'>
1372 + <model fallback='allow'/>
1374 + <clock offset='utc'/>
1375 + <on_poweroff>destroy</on_poweroff>
1376 + <on_reboot>restart</on_reboot>
1377 + <on_crash>restart</on_crash>
1379 + <emulator>/usr/bin/kvm</emulator>
1380 + <disk type='file' device='disk'>
1381 + <driver name='qemu' type='raw' cache='none' io='native'/>
1382 + <source file='disk.raw'/>
1383 + <target dev='vda' bus='virtio'/>
1385 + <address type='virtio-mmio'/>
1387 + <controller type='scsi' index='0' model='virtio-scsi'>
1388 + <address type='virtio-mmio'/>
1390 + <controller type='pci' index='0' model='pcie-root'/>
1391 + <interface type='bridge'>
1392 + <source bridge='admin8_br'/>
1393 + <model type='virtio'/>
1395 + <address type='virtio-mmio'/>
1397 + <interface type='bridge'>
1398 + <source bridge='public8_br'/>
1399 + <model type='virtio'/>
1400 + <address type='virtio-mmio'/>
1402 + <interface type='bridge'>
1403 + <source bridge='trunk8_br'/>
1404 + <model type='virtio'/>
1405 + <address type='virtio-mmio'/>
1407 + <serial type='pty'>
1408 + <target port='0'/>
1410 + <console type='pty'>
1411 + <target type='serial' port='0'/>
1416 diff --git a/deploy/templates/arm/virtual_environment/vms/fuel.xml b/deploy/templates/arm/virtual_environment/vms/fuel.xml
1417 new file mode 100644
1418 index 0000000..ad7c67f
1420 +++ b/deploy/templates/arm/virtual_environment/vms/fuel.xml
1422 +<domain type='kvm'>
1424 + <memory unit='KiB'>8290304</memory>
1425 + <currentMemory unit='KiB'>8290304</currentMemory>
1426 + <vcpu placement='static'>4</vcpu>
1428 + <partition>/machine</partition>
1431 + <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
1433 + <boot dev='cdrom'/>
1434 + <bootmenu enable='no'/>
1441 + <cpu mode='host-model'>
1442 + <model fallback='allow'/>
1444 + <clock offset='utc'>
1445 + <timer name='rtc' tickpolicy='catchup'/>
1446 + <timer name='pit' tickpolicy='delay'/>
1447 + <timer name='hpet' present='no'/>
1449 + <on_poweroff>destroy</on_poweroff>
1450 + <on_reboot>restart</on_reboot>
1451 + <on_crash>restart</on_crash>
1453 + <suspend-to-mem enabled='no'/>
1454 + <suspend-to-disk enabled='no'/>
1457 + <emulator>/usr/libexec/qemu-kvm</emulator>
1458 + <disk type='block' device='cdrom'>
1459 + <driver name='qemu' type='raw'/>
1460 + <target dev='hdc' bus='ide'/>
1463 + <disk type='file' device='disk'>
1464 + <driver name='qemu' type='raw' cache='none' io='native'/>
1465 + <source file='disk.raw'/>
1466 + <target dev='vda' bus='virtio'/>
1467 + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
1469 + <controller type='usb' index='0' model='ich9-ehci1'>
1470 + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
1472 + <controller type='usb' index='0' model='ich9-uhci1'>
1473 + <master startport='0'/>
1474 + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
1476 + <controller type='usb' index='0' model='ich9-uhci2'>
1477 + <master startport='2'/>
1478 + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
1480 + <controller type='usb' index='0' model='ich9-uhci3'>
1481 + <master startport='4'/>
1482 + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
1484 + <controller type='pci' index='0' model='pci-root'/>
1485 + <controller type='ide' index='0'>
1486 + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
1488 + <controller type='virtio-serial' index='0'>
1489 + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
1491 + <interface type='bridge'>
1492 + <source bridge='admin8_br0'/>
1493 + <model type='virtio'/>
1494 + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
1496 + <interface type='bridge'>
1497 + <source bridge='public8_br0'/>
1498 + <model type='virtio'/>
1499 + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
1501 + <serial type='pty'>
1502 + <target port='0'/>
1504 + <console type='pty'>
1505 + <target type='serial' port='0'/>
1507 + <input type='mouse' bus='ps2'/>
1508 + <input type='keyboard' bus='ps2'/>
1509 + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
1510 + <listen type='address' address='127.0.0.1'/>
1513 + <model type='vga' vram='16384' heads='1'/>
1514 + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
1516 + <memballoon model='virtio'>
1517 + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>