Config and corrections for auto deploy

- Corrected create_templates in order to compensate for a
malformed information depending when configuration is copied.
- Made the DHA IPMI adapter repeat every IPMI command three
times - for some reason needed with POD1 at LF, the reason
is unknown.
- Added DEA.yaml for Ericsson Montreal and LF POD1. The DHA.yaml
contains IPMI passwords so I am not really eager to put it into
Git without a discussion about the security implications.

JIRA

Change-Id: I667d73651c47c06d2ae17cc9c574bd021ff63a25
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/fuel/prototypes/auto-deploy/create_templates/create_templates.sh b/fuel/prototypes/auto-deploy/create_templates/create_templates.sh
index 8f6101b..8a43930 100755
--- a/fuel/prototypes/auto-deploy/create_templates/create_templates.sh
+++ b/fuel/prototypes/auto-deploy/create_templates/create_templates.sh
@@ -179,6 +179,11 @@ powerOnStrategy: sequence
 fuelCustomInstall: false
 EOF
 
+# Cleanup due to a currently unknown Fuel behavior adding this
+# output at certain stages, this information should not be present:
+sed -i '/ management_vip: ' $deafile
+sed -i '/ public_vip: ' $deafile
+
 
 echo "DEA file is available at $deafile"
 echo "DHA file is available at $dhafile (this is just a template)"
diff --git a/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py b/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py
index e4a7dd3..a475cdb 100755
--- a/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py
+++ b/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py
@@ -44,7 +44,7 @@ for interface in doc:
   networks = []
   for network in interface["assigned_networks"]:
     networks.append(network["name"])
-    if network["name"] == "management":
+    if network["name"] == "fuelweb_admin":
       dhaMac = interface["mac"]
   if networks:
     node["interfaces"][interface["name"]] = networks