aboutsummaryrefslogtreecommitdiffstats
path: root/func/spawn_vm.py
diff options
context:
space:
mode:
authorMofassirArif <Mofassir_Arif@dellteam.com>2016-01-21 06:42:23 -0800
committerMofassirArif <Mofassir_Arif@dellteam.com>2016-01-21 07:28:54 -0800
commit971a7c98515a9d83661f5e423f7e8390f35dca59 (patch)
treeee1d930fca39fa6875de6e18a2ae3dd9dba6f70f /func/spawn_vm.py
parent688380c212d1fc7cceb969a4d150c7764fcdeb77 (diff)
bug fix: result collection bug fix for docker images
Change-Id: Ia4ea09b90c7a4f4e3699af456c6d66e85661cc0b Signed-off-by: MofassirArif <Mofassir_Arif@dellteam.com>
Diffstat (limited to 'func/spawn_vm.py')
-rw-r--r--func/spawn_vm.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/func/spawn_vm.py b/func/spawn_vm.py
index 4723e999..9d1d0bad 100644
--- a/func/spawn_vm.py
+++ b/func/spawn_vm.py
@@ -43,20 +43,22 @@ class SpawnVM(Env_setup):
def get_installer_type(self):
print 'Getting Installer Name'
return os.environ['INSTALLER_TYPE']
-
+
def get_public_network(self,installer_detected):
-
+
'''
TODO: GET THE NAMES OF THE PUBLIC NETWORKS for OTHER PROJECTS
- '''
+ '''
print 'Getting Public Network'
if installer_detected.lower() == 'fuel':
return 'net04_ext'
if installer_detected.lower() == 'apex':
- return 'net04_ext'
+ return 'external'
if installer_detected.lower() == 'compass':
- return 'net04_ext'
-
+ return 'ext-net'
+ if installer_detected.lower() == 'joid':
+ return 'ext-net'
+
def HeatTemplate_vm(self, vm_params, installer):
try:
Heat_Dic=''
@@ -73,7 +75,7 @@ class SpawnVM(Env_setup):
fopenstr = fopenstr.rstrip()
scriptcmd = '#!/bin/bash \n echo {0} >> foo.txt \n echo {1} >> /root/.ssh/authorized_keys'.format(
fopenstr, fopenstr)
-
+
netName = self.get_public_network(installer)
print netName
Heat_Dic['heat_template_version'] = '2014-10-16'