Attention une mise à jour du service Gitlab va être effectuée le mardi 18 janvier (et non lundi 17 comme annoncé précédemment) entre 18h00 et 18h30. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes.

Commit de16113a authored by JONGLEZ Baptiste's avatar JONGLEZ Baptiste
Browse files

Merge branch 'general_fixes' into 'master'

Fix for issues preventing cluster bootstrap

See merge request !145
parents 9167c721 c32726a1
Pipeline #182875 passed with stages
in 7 minutes and 19 seconds
......@@ -65,3 +65,5 @@ disk_vendor_model_mapping:
Micron:
- MTFDDAK480TDN
- MTFDDAK960TDN
Unknown:
- unknown
......@@ -183,6 +183,7 @@ end
def add_kavlan_ipv6s(h)
h['sites'].each_pair do |site_uid, hs|
hs['clusters'].each_pair do |_cluster_uid, hc|
next if !hc['kavlan'] # skip clusters where kavlan is globally set to false (used for initial cluster installation)
hc['nodes'].each_pair do |node_uid, hn|
kvl_adapters = hn['network_adapters'].select { |_k,v| v['mountable'] and (v['kavlan'] or not v.has_key?('kavlan')) and v['interface'] == 'Ethernet' }
if kvl_adapters.length > 0
......@@ -222,6 +223,9 @@ def add_software(h)
h['sites'].each_pair do |site_uid, hs|
hs['clusters'].each_pair do |cluster_uid, hc|
hc['nodes'].each_pair do |node_uid, hn|
if not hn.key?('software')
hn['software'] = {}
end
hn['software']['postinstall-version'] = h['software']['postinstall-version']
hn['software']['forced-deployment-timestamp'] = h['software']['forced-deployment-timestamp']
end
......
......@@ -23,11 +23,13 @@ chassis:
exotic: optional_boolean
gpu_devices: optional_hash
kavlan:
<multi>:
<multi>: ip_address
<optional_hash>:
<multi>:
<multi>: ip_address
kavlan6:
<multi>:
<multi>: ip_address
<optional_hash>:
<multi>:
<multi>: ip_address
main_memory:
ram_size: integer
pmem_size: optional_integer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment