aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch
blob: db60202943d787a3d72aebd432959c3fda24f7b6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
From: Josep Puigdemont <josep.puigdemont@enea.com>
Date: Wed, 4 May 2016 14:27:23 +0200
Subject: [PATCH] virtual_fuel: make vm_template an attibute

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 deploy/environments/virtual_fuel.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
index f07207f..92a234c 100644
--- a/deploy/environments/virtual_fuel.py
+++ b/deploy/environments/virtual_fuel.py
@@ -46,6 +46,10 @@ class VirtualFuel(ExecutionEnvironment):
         self.temp_dir = tempfile.mkdtemp()
         self.vm_name = self.dha.get_node_property(self.fuel_node_id,
                                                   'libvirtName')
+        self.vm_template = '%s/%s' % (self.root_dir,
+                                      self.dha.get_node_property(
+                                          self.fuel_node_id, 'libvirtTemplate'))
+        check_file_exists(self.vm_template)
 
     def __del__(self):
         delete(self.temp_dir)
@@ -106,7 +110,7 @@ class VirtualFuel(ExecutionEnvironment):
         disk_path = self.create_image(disk_path, disk_size)
 
         temp_vm_file = '%s/%s' % (self.temp_dir, self.vm_name)
-        exec_cmd('cp %s %s' % (vm_template, temp_vm_file))
+        exec_cmd('cp %s %s' % (self.vm_template, temp_vm_file))
         self.set_vm_nic(temp_vm_file)
         vm_definition_overwrite = self.dha.get_vm_definition('fuel')
         self.define_vm(self.vm_name, temp_vm_file, disk_path,
string InstanceDiscoveryMethod: default: 'libvirt_metadata' description: Method used to discover instances running on compute node type: string constraints: - allowed_values: ['naive', 'libvirt_metadata', 'workload_partitioning'] resources: CeilometerServiceBase: type: ./ceilometer-base.yaml properties: ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} outputs: role_data: description: Role data for the Ceilometer Compute Agent role. value: service_name: ceilometer_agent_compute monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCompute} config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] - ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod} step_config: | include ::tripleo::profile::base::ceilometer::agent::compute upgrade_tasks: - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running" shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b' tags: step0,validation - name: Stop ceilometer_agent_compute service tags: step2 service: name=openstack-ceilometer-compute state=stopped