summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzilard Cserey <szilard.cserey@ericsson.com>2015-06-29 14:44:10 +0200
committerSzilard Cserey <szilard.cserey@ericsson.com>2015-06-29 14:50:23 +0200
commit5ac69cdd9953c3cdfb37975d43222eac74cf7cb7 (patch)
tree82273c44651a99fada7902f55db2bd7a68a0038a
parent49bba276a8e260d5008824757b6e53860c2c5e34 (diff)
change in Fuel VM name
for eliminating the conflict between prototype and production autodeployers JIRA: [BGS-2] Create Fuel deployment script Change-Id: Ib12d3643dd07a3dcbc8b8d19593385348b583ad2 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
-rw-r--r--fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dha.yaml2
-rw-r--r--fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dha.yaml2
-rw-r--r--fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dha.yaml2
-rw-r--r--fuel/deploy/baremetal/conf/linux_foundation_lab/multinode/dha.yaml2
-rw-r--r--fuel/deploy/baremetal/vms/fuel_lf.xml2
-rw-r--r--fuel/deploy/environments/virtual_fuel.py3
6 files changed, 6 insertions, 7 deletions
diff --git a/fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dha.yaml b/fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dha.yaml
index 562d6cd..1f87d52 100644
--- a/fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dha.yaml
+++ b/fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dha.yaml
@@ -44,7 +44,7 @@ nodes:
# Adding the Fuel node as node id 7 which may not be correct - please
# adjust as needed.
- id: 7
- libvirtName: vFuel
+ libvirtName: fuel-opnfv
libvirtTemplate: baremetal/vms/fuel.xml
isFuel: yes
username: root
diff --git a/fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dha.yaml b/fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dha.yaml
index 562d6cd..1f87d52 100644
--- a/fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dha.yaml
+++ b/fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dha.yaml
@@ -44,7 +44,7 @@ nodes:
# Adding the Fuel node as node id 7 which may not be correct - please
# adjust as needed.
- id: 7
- libvirtName: vFuel
+ libvirtName: fuel-opnfv
libvirtTemplate: baremetal/vms/fuel.xml
isFuel: yes
username: root
diff --git a/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dha.yaml b/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dha.yaml
index 5acd389..d7f00c7 100644
--- a/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dha.yaml
+++ b/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dha.yaml
@@ -39,7 +39,7 @@ nodes:
# Adding the Fuel node as node id 6 which may not be correct - please
# adjust as needed.
- id: 6
- libvirtName: vFuel
+ libvirtName: fuel-opnfv
libvirtTemplate: baremetal/vms/fuel_lf.xml
isFuel: yes
username: root
diff --git a/fuel/deploy/baremetal/conf/linux_foundation_lab/multinode/dha.yaml b/fuel/deploy/baremetal/conf/linux_foundation_lab/multinode/dha.yaml
index 5acd389..d7f00c7 100644
--- a/fuel/deploy/baremetal/conf/linux_foundation_lab/multinode/dha.yaml
+++ b/fuel/deploy/baremetal/conf/linux_foundation_lab/multinode/dha.yaml
@@ -39,7 +39,7 @@ nodes:
# Adding the Fuel node as node id 6 which may not be correct - please
# adjust as needed.
- id: 6
- libvirtName: vFuel
+ libvirtName: fuel-opnfv
libvirtTemplate: baremetal/vms/fuel_lf.xml
isFuel: yes
username: root
diff --git a/fuel/deploy/baremetal/vms/fuel_lf.xml b/fuel/deploy/baremetal/vms/fuel_lf.xml
index 2dd9738..31b5490 100644
--- a/fuel/deploy/baremetal/vms/fuel_lf.xml
+++ b/fuel/deploy/baremetal/vms/fuel_lf.xml
@@ -1,5 +1,5 @@
<domain type='kvm' id='62'>
- <name>vFuel</name>
+ <name>fuel</name>
<memory unit='KiB'>8290304</memory>
<currentMemory unit='KiB'>8290304</currentMemory>
<vcpu placement='static'>4</vcpu>
diff --git a/fuel/deploy/environments/virtual_fuel.py b/fuel/deploy/environments/virtual_fuel.py
index 1f939f0..f8b6791 100644
--- a/fuel/deploy/environments/virtual_fuel.py
+++ b/fuel/deploy/environments/virtual_fuel.py
@@ -11,8 +11,7 @@ check_if_root = common.check_if_root
class VirtualFuel(ExecutionEnvironment):
def __init__(self, storage_dir, pxe_bridge, dha_file, root_dir):
- super(VirtualFuel, self).__init__(
- storage_dir, dha_file, root_dir)
+ super(VirtualFuel, self).__init__(storage_dir, dha_file, root_dir)
self.pxe_bridge = pxe_bridge
def set_vm_nic(self, temp_vm_file):