diff options
| author |   Stefan Berg <stefan.k.berg@ericsson.com> | 2015-06-29 14:34:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-06-29 14:34:16 +0000 |
| commit | 5847a0f09e22d19eaa8590fdb3b3eb3d6fa2a51b (patch) | |
| tree | ec111a3604179cbed06f8003ab6fbfd9d4afbc34 /fuel | |
| parent | cd98f0da79848c16904680fb34fc5891cd4b2e7a (diff) | |
| parent | 0b5c7785fcb44089f9fdf17d51d1338f81e8de11 (diff) | |
Merge "change in Fuel VM name"
Diffstat (limited to 'fuel')
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): |