aboutsummaryrefslogtreecommitdiffstats
path: root/labs/zte/pod2/fuel/config/dha.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'labs/zte/pod2/fuel/config/dha.yaml')
-rw-r--r--labs/zte/pod2/fuel/config/dha.yaml21
1 files changed, 10 insertions, 11 deletions
diff --git a/labs/zte/pod2/fuel/config/dha.yaml b/labs/zte/pod2/fuel/config/dha.yaml
index 69001ad..98ee6a0 100644
--- a/labs/zte/pod2/fuel/config/dha.yaml
+++ b/labs/zte/pod2/fuel/config/dha.yaml
@@ -12,28 +12,28 @@ adapter: zte
nodes:
- id: 1
- pxeMac: 3c:da:2a:e8:01:ed
- ipmiIp: 129.5.1.9
+ pxeMac: 74:4A:A4:00:CD:72
+ ipmiIp: 192.168.1.106
ipmiUser: zteroot
ipmiPass: superuser
- id: 2
- pxeMac: 3c:da:2a:e8:02:4c
- ipmiIp: 129.5.1.10
+ pxeMac: 74:4A:A4:00:CA:CC
+ ipmiIp: 192.168.1.107
ipmiUser: zteroot
ipmiPass: superuser
- id: 3
- pxeMac: 3c:da:2a:e8:01:a7
- ipmiIp: 129.5.1.11
+ pxeMac: 74:4A:A4:00:CD:12
+ ipmiIp: 192.168.1.108
ipmiUser: zteroot
ipmiPass: superuser
- id: 4
- pxeMac: 3c:da:2a:e8:01:ca
- ipmiIp: 129.5.1.12
+ pxeMac: 74:4A:A4:00:CF:40
+ ipmiIp: 192.168.1.109
ipmiUser: zteroot
ipmiPass: superuser
- id: 5
- pxeMac: 3c:da:2a:e8:01:b6
- ipmiIp: 129.5.1.13
+ pxeMac: 74:4A:A4:00:CE:D4
+ ipmiIp: 192.168.1.110
ipmiUser: zteroot
ipmiPass: superuser
@@ -49,4 +49,3 @@ nodes:
disks:
fuel: 100G
-
reprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 9 Jun 2016 21:37:48 +0200
Subject: [PATCH] mcagent: Increase max shell command timeout to 2h

Since `execute_shell_command` mcagent is used for building the target
image and the timeout provided in the astute task is just respected on
the Astute level (on mcollective level this timeout is actually a
minumum between value provided and ddl value) we need to increase it
for Armband operation.

Because Armband builds the target image via `qemu-debootstrap`, it can
take more than 1 hour to finish the building. Therefore aside of
increasing the timeout in the Astute task, the maximum timeout value
for mcagent has to be increased.

[ Alexandru Avadanii ]
Repackaged, based on Stan's `fuel-astute` patch.

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../f_bootstrap/post-scripts/80_prepare_cross_builds.sh    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
index d33d1d1..d78b850 100755
--- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
+++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
@@ -26,6 +26,20 @@ if which dpkg > /dev/null 2>&1; then
       echo "Error starting systemd-binfmt!"
       exit 1
     fi
+
+    # Cross-build timeout adjustments
+    #
+    # Since `execute_shell_command` mcagent is used for building the target
+    # image and the timeout provided in the astute task is just respected on
+    # the Astute level (on mcollective level this timeout is actually a
+    # minumum between value provided and ddl value) we need to increase it
+    # for cross-build operations.
+
+    # Building the target image via `qemu-debootstrap` can take more than
+    # 1 hour. Therefore aside of increasing the timeout in the Astute task,
+    # the maximum timeout value for mcagent has to be increased (use 2h).
+    sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \
+      /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl
   fi
 fi