patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch

   1 From: Guillermo Herrero <Guillermo.Herrero@enea.com>
   2 Date: Tue, 25 Jul 2017 00:58:32 +0200
   3 Subject: [PATCH] mcp: salt-formulas: Add & enable armband formula
   4
   5 FIXME: Re-enable apparmor.
   6 FIXME: Detect baremetal and re-enable acceleration.
   7
   8 - install qemu-efi;
   9 - install vgabios;
  10 - disable apparmor as security driver for libvirt (temporary);
  11 - fix missing link for vgabios binary blob;
  12 - nova: virt_type=qemu (temporary, until we support baremetal too);
  13 - nova: pointer_model=ps2mouse since AArch64 has no USB tablet;
  14 - nova: cpu_model=cortex-a57;
  15 - nova: libvirt driver: Add ttyAMA0 by default on AArch64;
  16 - nova: libvirt driver: Use VGA video type by default on AArch64;
  17
  18 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  19 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
  20 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  21 ---
  22  mcp/config/states/maas                             |  1 +
  23  mcp/config/states/openstack                        |  2 +
  24  .../armband/files/nova-libvirt-driver.diff         | 48 ++++++++++++++++++++++
  25  mcp/salt-formulas/armband/init.sls                 |  6 +++
  26  mcp/salt-formulas/armband/libvirt_driver.sls       |  5 +++
  27  mcp/salt-formulas/armband/nova.sls                 | 34 +++++++++++++++
  28  mcp/salt-formulas/armband/qemu.sls                 |  7 ++++
  29  mcp/salt-formulas/armband/vgabios.sls              |  6 +++
  30  8 files changed, 109 insertions(+)
  31  create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-driver.diff
  32  create mode 100644 mcp/salt-formulas/armband/init.sls
  33  create mode 100644 mcp/salt-formulas/armband/libvirt_driver.sls
  34  create mode 100644 mcp/salt-formulas/armband/nova.sls
  35  create mode 100644 mcp/salt-formulas/armband/qemu.sls
  36  create mode 100644 mcp/salt-formulas/armband/vgabios.sls
  37
  38 diff --git a/mcp/config/states/maas b/mcp/config/states/maas
  39 index 8b59910..3b722ea 100755
  40 --- a/mcp/config/states/maas
  41 +++ b/mcp/config/states/maas
  42 @@ -42,6 +42,7 @@ salt -C 'mas01*' pillar.item\
  43  salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
  44  salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
  45
  46 +salt -C 'kvm*' state.sls armband
  47  salt -C 'kvm*' state.sls libvirt
  48
  49  salt -C '* and not cfg01* and not mas01*' system.reboot
  50 diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
  51 index 57ca585..23aaf72 100755
  52 --- a/mcp/config/states/openstack
  53 +++ b/mcp/config/states/openstack
  54 @@ -23,3 +23,5 @@ salt -I 'neutron:gateway' state.sls neutron
  55  salt -I 'nova:compute' state.sls nova
  56
  57  salt -I 'horizon:server' state.sls horizon
  58 +
  59 +salt -I 'nova:compute' state.sls armband
  60 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff
  61 new file mode 100644
  62 index 0000000..a5b08da
  63 --- /dev/null
  64 +++ b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff
  65 @@ -0,0 +1,48 @@
  66 +From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
  67 +Date: Tue, 22 Mar 2016 12:05:09 +0100
  68 +Subject: [PATCH] nova: Update vga, console defaults for armv7, aarch64
  69 +
  70 +Nova hardcodes default options for both video=cirrus and console.
  71 +armv7 and aarch64 VMs require video=vga, and since most applications
  72 +use PL011 serial driver for guests, adding console=ttyAMA0 is also
  73 +a nice UX addition.
  74 +
  75 +Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
  76 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  77 +Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  78 +
  79 +---
  80 + usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py | 10 +++++++++-
  81 + 1 file changed, 9 insertions(+), 1 deletion(-)
  82 +
  83 +diff --git a/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py b/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py
  84 +index bba9b00..99e86be 100644
  85 +--- a/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py
  86 ++++ b/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py
  87 +@@ -4179,7 +4179,12 @@ class LibvirtDriver(driver.ComputeDriver):
  88 +         if virt_type == "xen":
  89 +             guest.os_cmdline = "ro root=%s" % root_device_name
  90 +         else:
  91 ++            guestarch = libvirt_utils.get_arch(image_meta)
  92 +             guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE))
  93 ++            if guestarch in (fields.Architecture.ARMV7,
  94 ++                             fields.Architecture.AARCH64):
  95 ++                # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console
  96 ++                guest.os_cmdline += " console=ttyAMA0"
  97 +             if virt_type == "qemu":
  98 +                 guest.os_cmdline += " no_timer_check"
  99 +         if instance.ramdisk_id:
 100 +@@ -4288,9 +4293,12 @@ class LibvirtDriver(driver.ComputeDriver):
 101 +             video.type = 'xen'
 102 +         elif CONF.libvirt.virt_type == 'parallels':
 103 +             video.type = 'vga'
 104 +-        elif guestarch in (fields.Architecture.PPC,
 105 ++        elif guestarch in (fields.Architecture.ARMV7,
 106 ++                           fields.Architecture.AARCH64,
 107 ++                           fields.Architecture.PPC,
 108 +                            fields.Architecture.PPC64,
 109 +                            fields.Architecture.PPC64LE):
 110 ++            # NOTE(armband): Added ARM v7/v8, same as on PPC.
 111 +             # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default
 112 +             # so use 'vga' instead when running on Power hardware.
 113 +             video.type = 'vga'
 114 diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls
 115 new file mode 100644
 116 index 0000000..6e7b6ad
 117 --- /dev/null
 118 +++ b/mcp/salt-formulas/armband/init.sls
 119 @@ -0,0 +1,6 @@
 120 +include:
 121 + - armband.qemu
 122 + - armband.vgabios
 123 + - armband.nova
 124 + - armband.libvirt_driver
 125 +
 126 diff --git a/mcp/salt-formulas/armband/libvirt_driver.sls b/mcp/salt-formulas/armband/libvirt_driver.sls
 127 new file mode 100644
 128 index 0000000..c309035
 129 --- /dev/null
 130 +++ b/mcp/salt-formulas/armband/libvirt_driver.sls
 131 @@ -0,0 +1,5 @@
 132 +/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py:
 133 +  file.patch:
 134 +  - source:  salt://armband/files/nova-libvirt-driver.diff
 135 +  - hash: "668641080c6a77a9205d0f71d510ad5f"
 136 +
 137 diff --git a/mcp/salt-formulas/armband/nova.sls b/mcp/salt-formulas/armband/nova.sls
 138 new file mode 100644
 139 index 0000000..ade8c7a
 140 --- /dev/null
 141 +++ b/mcp/salt-formulas/armband/nova.sls
 142 @@ -0,0 +1,34 @@
 143 +{% if grains['virtual'] == 'kvm' %}
 144 +nova_virt_type:
 145 +  file.replace:
 146 +    - name: "/etc/nova/nova.conf"
 147 +    - pattern: ^virt_type =.*$
 148 +    - repl: "virt_type = qemu"
 149 +{% endif %}
 150 +
 151 +nova_pointer_model:
 152 +  file.replace:
 153 +    - name: "/etc/nova/nova.conf"
 154 +    - pattern: ^#pointer_model=.*$
 155 +    - repl: "pointer_model=ps2mouse"
 156 +
 157 +nova_cpu_mode:
 158 +  file.replace:
 159 +    - name: "/etc/nova/nova.conf"
 160 +    - pattern: "^cpu_mode = host-passthrough"
 161 +    - repl: "cpu_mode=custom"
 162 +
 163 +nova_cpu_model:
 164 +  file.replace:
 165 +    - name: "/etc/nova/nova.conf"
 166 +    - pattern: ^#cpu_model=.*$
 167 +    {% if grains['virtual'] == 'kvm' %}
 168 +    - repl: "cpu_model=cortex-a57"
 169 +    {% else %}
 170 +    - repl: "cpu_model=host"
 171 +    {% endif %}
 172 +
 173 +restart_nova-compute:
 174 +  cmd:
 175 +    - run
 176 +    - name: "service nova-compute restart"
 177 diff --git a/mcp/salt-formulas/armband/qemu.sls b/mcp/salt-formulas/armband/qemu.sls
 178 new file mode 100644
 179 index 0000000..ecdb5ae
 180 --- /dev/null
 181 +++ b/mcp/salt-formulas/armband/qemu.sls
 182 @@ -0,0 +1,7 @@
 183 +qemu-efi:
 184 +  pkg.installed
 185 +/etc/libvirt/qemu.conf:
 186 +  file.replace:
 187 +    - pattern: ^#security_driver =.*$
 188 +    - repl: "security_driver = \"none\""
 189 +
 190 diff --git a/mcp/salt-formulas/armband/vgabios.sls b/mcp/salt-formulas/armband/vgabios.sls
 191 new file mode 100644
 192 index 0000000..a31eafa
 193 --- /dev/null
 194 +++ b/mcp/salt-formulas/armband/vgabios.sls
 195 @@ -0,0 +1,6 @@
 196 +vgabios:
 197 +  pkg.installed
 198 +/usr/share/qemu/vgabios-stdvga.bin:
 199 +  file.symlink:
 200 +    - target: "/usr/share/vgabios/vgabios.bin"
 201 +