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

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