patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Mon, 7 Aug 2017 19:45:01 +0200
   3 Subject: [PATCH] maas: Add curtin_userdata_arm64_generic_xenial
   4
   5 Add AArch64 specific configuration.
   6
   7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   8 ---
   9  ...-Add-curtin_userdata_arm64_generic_xenial.patch | 76 ++++++++++++++++++++++
  10  mcp/patches/patches.list                           |  1 +
  11  2 files changed, 77 insertions(+)
  12  create mode 100644 mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  13
  14 diff --git a/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  15 new file mode 100644
  16 index 0000000..b969e07
  17 --- /dev/null
  18 +++ b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  19 @@ -0,0 +1,76 @@
  20 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  21 +Date: Sat, 5 Aug 2017 02:03:01 +0200
  22 +Subject: [PATCH] maas: Add curtin_userdata_arm64_generic_xenial
  23 +
  24 +Based on curtin_userdata_amd64_generic_xenial, add new arm64
  25 +specific configuration file:
  26 +- curtin_userdata_arm64_generic_xenial
  27 +
  28 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  29 +---
  30 +
  31 +diff --git a/maas/region.sls b/maas/region.sls
  32 +--- a/maas/region.sls
  33 ++++ b/maas/region.sls
  34 +@@ -70,6 +70,18 @@
  35 +   - require:
  36 +     - pkg: maas_region_packages
  37 +
  38 ++/etc/maas/preseeds/curtin_userdata_arm64_generic_xenial:
  39 ++  file.managed:
  40 ++  - source: salt://maas/files/curtin_userdata_arm64_generic_xenial
  41 ++  - template: jinja
  42 ++  - user: root
  43 ++  - group: root
  44 ++  - mode: 644
  45 ++  - context:
  46 ++      salt_master_ip: {{ region.salt_master_ip }}
  47 ++  - require:
  48 ++    - pkg: maas_region_packages
  49 ++
  50 + maas_region_services:
  51 +   service.running:
  52 +   - enable: true
  53 +diff --git a/maas/files/curtin_userdata_arm64_generic_xenial b/maas/files/curtin_userdata_arm64_generic_xenial
  54 +new file mode 100644
  55 +--- /dev/null
  56 ++++ b/maas/files/curtin_userdata_arm64_generic_xenial
  57 +@@ -0,0 +1,38 @@
  58 ++{%- from "maas/map.jinja" import server with context %}
  59 ++{% raw %}
  60 ++#cloud-config
  61 ++debconf_selections:
  62 ++ maas: |
  63 ++  {{for line in str(curtin_preseed).splitlines()}}
  64 ++  {{line}}
  65 ++  {{endfor}}
  66 ++{{if third_party_drivers and driver}}
  67 ++early_commands:
  68 ++  {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}}
  69 ++  driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg
  70 ++  driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
  71 ++  driver_02_add: ["add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
  72 ++  driver_03_update_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install {{driver['package']}}"]
  73 ++  driver_04_load: ["sh", "-c", "depmod && modprobe {{driver['module']}}"]
  74 ++{{endif}}
  75 ++late_commands:
  76 ++  maas: [wget, '--no-proxy', {{node_disable_pxe_url|escape.json}}, '--post-data', {{node_disable_pxe_data|escape.json}}, '-O', '/dev/null']
  77 ++  apt_00_set_repo: ["curtin", "in-target", "--", "sh", "-c", "echo 'deb [arch=arm64] http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest xenial main' >> /etc/apt/sources.list"]
  78 ++  apt_01_set_gpg: ["curtin", "in-target", "--", "sh", "-c", "echo 'LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tClZlcnNpb246IEdudVBHIHYxCgptUUVOQkZhZ0Fyb0JDQURXYm9OSWp1RjZsQjFtV3YyK0VidnFZM2xLbDVtTEtocjJEblNVa0tlSFVQQnY4Z05NCnFLOFEwMEFNSXlQaXlFaGdqQStkV2l6Wis1YUJneG9pWTdvTWVMSjJYeW0zNlUvOFNZcTJCV2QzU0dDYk1Ob3oKU0pEeERVU00vSEZWczZhdEYxTTNEWTlvTjY1aFNWbnU0dXk1VHU2YXNmNms0cmhBeWswejQrcFJjUEJDdTJ2cQptbkdpM0NPTS8rOVBTaHJFS2VWT3g1VzJ2Ukp5d1VGdXE4RUR2UW5Sb0owR3ZNMjhKaUpJYW53MTdZd0lQeGhnCkJLWlZwWmphbjVYK2loVk1Yd0EyaC9HL0ZTNU9taGQ1MFJxVjZMV1NZczk0VkpKZ1lxSHg4VU1tN2l6Y3hJK1AKY3QzSWNiRDE5NWJQYkorU2J1aUZlNDVaTHNkWTFNeUdpVTJCQUJFQkFBRzBLMFZ1WldFZ1FYSnRZbUZ1WkNCRQpaWFp2Y0hNZ1ZHVmhiU0E4WVhKdFltRnVaRUJsYm1WaExtTnZiVDZKQVQ0RUV3RUNBQ2dGQWxhZ0Fyb0NHd01GCkNRUENad0FHQ3drSUJ3TUNCaFVJQWdrS0N3UVdBZ01CQWg0QkFoZUFBQW9KRU42cmtMcDVpckhSc0c4SC8yUDIKaE82akZIUFJEMXU4ajl1Zk85QXhvSW5hRUc5R2VSanV2TWMxdENVem92WHZUczEwNlRaMGFzNk1iQUoxUzZ1NQpFOFV5UTErVkdlcHZkSUpQWHgzUEN4TG1VdDZXSXFtZE9kcUZyeEljbG9oaWcva2FyZGkzTmZYMU1CdmxFVi9jCjdRNTFINDNocmxNcU1wcWdZMUJtKzUzUExDNHVqamxESkJ0Sk9FVTlka2kzMTliVW1uZytnTzlCQWxqREpGWHYKSnFZNitQL2VyN0lnQ2JSWFVYWWZ5Snpnang5SndsS2JtZFE4UW5DclpqRi9WSElXNDAvbXU1SUlKdUZ2dUN0aQp0Y29nK1NOU2xEbUNPUyt3RThDQ29qZXVKcXVwSU9jejl6eXBWR3pldXMvTjVRNUVFRmU3R1lXWVMvNU5LVWtFCjFUdXVGZVpLdTVOSkM1cmt3SVU9Cj03cDYwCi0tLS0tRU5EIFBHUCBQVUJMSUMgS0VZIEJMT0NLLS0tLS0K'|base64 -d|apt-key add -"]
  79 ++  apt_03_update: ["curtin", "in-target", "--", "apt-get", "update"]
  80 ++  salt_01_install: ["curtin", "in-target", "--", "apt-get", "-y", "install", "salt-minion"]
  81 ++{% endraw %}
  82 ++  salt_02_hostname_set: ["curtin", "in-target", "--", "echo", "{% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}"]
  83 ++  salt_03_hostname_get: ["curtin", "in-target", "--", "sh", "-c", "echo 'id: {% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}' >> /etc/salt/minion"]
  84 ++  salt_04_master: ["curtin", "in-target", "--", "sh", "-c", "echo 'master: {{ salt_master_ip }}' >> /etc/salt/minion"]
  85 ++{% raw %}
  86 ++{{if third_party_drivers and driver}}
  87 ++  driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
  88 ++  driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
  89 ++  driver_03_add: ["curtin", "in-target", "--", "add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
  90 ++  driver_04_update_install: ["curtin", "in-target", "--", "apt-get", "update", "--quiet"]
  91 ++  driver_05_install: ["curtin", "in-target", "--", "apt-get", "-y", "install", "{{driver['package']}}"]
  92 ++  driver_06_depmod: ["curtin", "in-target", "--", "depmod"]
  93 ++  driver_07_update_initramfs: ["curtin", "in-target", "--", "update-initramfs", "-u"]
  94 ++{{endif}}
  95 ++{% endraw %}
  96 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
  97 index 1a651cf..c66ecb0 100644
  98 --- a/mcp/patches/patches.list
  99 +++ b/mcp/patches/patches.list
 100 @@ -5,3 +5,4 @@
 101  /usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch
 102  /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch
 103  /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch
 104 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch