From: Szilard Cserey <szilard.cserey@ericsson.com>
Date: Thu, 27 Aug 2015 12:06:34 +0000 (+0200)
Subject: FIX for DHA libvirt template
X-Git-Tag: arno.2015.2.0~59
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=genesis.git;a=commitdiff_plain;h=fff825c3053cd43f3a4b795d98554a6146155fa1

FIX for DHA libvirt template

Change-Id: I5c04770970fc781f1c7f95ef0f8e308f2c541f89
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
---

diff --git a/fuel/deploy/libvirt/conf/ha/dha.yaml b/fuel/deploy/libvirt/conf/ha/dha.yaml
index d862f64..6b6efb0 100644
--- a/fuel/deploy/libvirt/conf/ha/dha.yaml
+++ b/fuel/deploy/libvirt/conf/ha/dha.yaml
@@ -15,19 +15,19 @@ nodes:
   libvirtName: controller1
   libvirtTemplate: libvirt/vms/controller.xml
 - id: 2
-  libvirtName: compute1
-  libvirtTemplate: libvirt/vms/compute.xml
+  libvirtName: controller2
+  libvirtTemplate: libvirt/vms/controller.xml
 - id: 3
-  libvirtName: compute2
-  libvirtTemplate: libvirt/vms/compute.xml
+  libvirtName: controller3
+  libvirtTemplate: libvirt/vms/controller.xml
 - id: 4
-  libvirtName: compute3
+  libvirtName: compute1
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 5
-  libvirtName: compute4
+  libvirtName: compute2
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 6
-  libvirtName: compute5
+  libvirtName: compute3
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 7
   libvirtName: fuel-master
diff --git a/fuel/deploy/libvirt/conf/multinode/dha.yaml b/fuel/deploy/libvirt/conf/multinode/dha.yaml
index 5e560bf..d862f64 100644
--- a/fuel/deploy/libvirt/conf/multinode/dha.yaml
+++ b/fuel/deploy/libvirt/conf/multinode/dha.yaml
@@ -15,19 +15,19 @@ nodes:
   libvirtName: controller1
   libvirtTemplate: libvirt/vms/controller.xml
 - id: 2
-  libvirtName: controller2
+  libvirtName: compute1
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 3
-  libvirtName: controller3
+  libvirtName: compute2
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 4
-  libvirtName: compute1
+  libvirtName: compute3
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 5
-  libvirtName: compute2
+  libvirtName: compute4
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 6
-  libvirtName: compute3
+  libvirtName: compute5
   libvirtTemplate: libvirt/vms/compute.xml
 - id: 7
   libvirtName: fuel-master