diff --git a/slapos/recipe/accords/__init__.py b/slapos/recipe/accords/__init__.py index 19471e9cc336cfdc17818dbf916a12a4be411a13..dbd10c62442f99e37724b2566b3e41c8da2b2af2 100644 --- a/slapos/recipe/accords/__init__.py +++ b/slapos/recipe/accords/__init__.py @@ -38,6 +38,7 @@ class Recipe(GenericSlapRecipe): parameter_dict = dict( userid=self.options['userid'], + tenantname=self.options['tenantname'], password=self.options['password'], domain=self.options['domain'], openstack_url=self.options['openstack_url'], diff --git a/slapos/recipe/accords/template/testos.in b/slapos/recipe/accords/template/testos.in index f7c085286558b2d702e334e55cd43ddf7399ca9e..2413a33846e07c1073ce0f0465ef70f60f32f8cd 100644 --- a/slapos/recipe/accords/template/testos.in +++ b/slapos/recipe/accords/template/testos.in @@ -6,5 +6,6 @@ export ENO_HOST=%(openstack_url)s export ENO_USER=%(userid)s export ENO_PASS=%(password)s export ENO_VERSION=v1.1 +export ENO_TENANT=%(tenantname)s -testos --host $ENO_HOST --password $ENO_PASS --user $ENO_USER --version $ENO_VERSION $1 $2 $3 $4 $5 $6 $7 +testos --host $ENO_HOST --password $ENO_PASS --user $ENO_USER --version $ENO_VERSION --tenant $ENO_TENANT $1 $2 $3 $4 $5 $6 $7 diff --git a/stack/accords/instance-accords.cfg b/stack/accords/instance-accords.cfg index 1d71ab9a492ebd91b5fa186ecd26a2d0e8ec4c53..88ab315c6f0e33702d0beabcef58835c53bbfc3f 100644 --- a/stack/accords/instance-accords.cfg +++ b/stack/accords/instance-accords.cfg @@ -18,9 +18,11 @@ recipe = slapos.cookbook:accords userid = cedric.de password = phahghae domain = domain +tenantname = vifib #userid = $${slap-parameter:userid} #password = $${slap-parameter:password} #domain = $${slap-parameter:domain} +#tenantname = $${slap-parameter:tenantname} openstack_url = http://beta.enocloud.com:5000/v2.0/ os-config = $${accordsdirectory:accords}/os_config.xml listen-ip = $${slap-network-information:local-ipv4}