diff options
| author |   Delia Popescu <delia.popescu@enea.com> | 2017-12-15 12:22:07 +0200 |
|---|---|---|
| committer | Delia Popescu <delia.popescu@enea.com> | 2017-12-15 11:43:46 +0000 |
| commit | f191bfb674a3a12fab3dbb304af982e8675d3d98 (patch) | |
| tree | 3a328890a683e24bbbf8ea29204686f3e3380e5c /patches/opnfv-fuel | |
| parent | 5312ef6a151a141776856e649a0e7d610b0ad626 (diff) | |
salt-formulas: change virt_type to qemu for virtual deploys
nova-compute conf: virt_type=qemu (only for virtual deploys)
JIRA: ARMBAND-339
Change-Id: I5e9e21b39cb481a47dbd105aa0f03126c3ae92d3
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
| -rw-r--r-- | patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 94d3c7af..696ca7ec 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch @@ -19,6 +19,7 @@ Subject: [PATCH] salt-formulas: Add & enable armband formula - nova patch: libvirt driver: AArch64: ACPI depends on AAVMF; - nova conf: cpu_model=cortex-a57 (only for virtual deploys); - nova conf: virt_type=qemu (only for virtual deploys); +- nova compute conf: virt_type=qemu (only for virtual deploys); - nova conf: pointer_model=ps2mouse since AArch64 has no USB tablet; [1] https://github.com/openstack/nova/commit/8075797 @@ -33,11 +34,11 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> mcp/config/states/virtual_control_plane | 1 + .../armband/files/nova-libvirt-aarch64-rollup.diff | 270 +++++++++++++++++++++ mcp/salt-formulas/armband/init.sls | 7 + - mcp/salt-formulas/armband/nova_config.sls | 30 +++ + mcp/salt-formulas/armband/nova_config.sls | 34 +++ mcp/salt-formulas/armband/nova_libvirt.sls | 7 + mcp/salt-formulas/armband/qemu_efi.sls | 2 + mcp/salt-formulas/armband/vgabios.sls | 7 + - 9 files changed, 327 insertions(+) + 9 files changed, 331 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff create mode 100644 mcp/salt-formulas/armband/init.sls create mode 100644 mcp/salt-formulas/armband/nova_config.sls @@ -370,16 +371,20 @@ index 0000000..8a8cf2a + {%- endif %} diff --git a/mcp/salt-formulas/armband/nova_config.sls b/mcp/salt-formulas/armband/nova_config.sls new file mode 100644 -index 0000000..674f371 +index 0000000..8f19eda --- /dev/null +++ b/mcp/salt-formulas/armband/nova_config.sls -@@ -0,0 +1,30 @@ +@@ -0,0 +1,34 @@ +{% if grains['virtual'] == 'kvm' %} +nova_virt_type: + file.replace: + - name: "/etc/nova/nova.conf" + - pattern: '^virt_type\s*=.*$' + - repl: "virt_type = qemu" ++ file.replace: ++ - name: "/etc/nova/nova-compute.conf" ++ - pattern: '^virt_type\s*=.*$' ++ - repl: "virt_type = qemu" +{% endif %} +nova_pointer_model: + file.replace: |