Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
slapos
Commits
8f1558ff
Commit
8f1558ff
authored
Nov 26, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tenantname, mandatory but not documented in accords...
parent
66baad88
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
slapos/recipe/accords/__init__.py
slapos/recipe/accords/__init__.py
+1
-0
slapos/recipe/accords/template/testos.in
slapos/recipe/accords/template/testos.in
+2
-1
stack/accords/instance-accords.cfg
stack/accords/instance-accords.cfg
+2
-0
No files found.
slapos/recipe/accords/__init__.py
View file @
8f1558ff
...
@@ -38,6 +38,7 @@ class Recipe(GenericSlapRecipe):
...
@@ -38,6 +38,7 @@ class Recipe(GenericSlapRecipe):
parameter_dict
=
dict
(
parameter_dict
=
dict
(
userid
=
self
.
options
[
'userid'
],
userid
=
self
.
options
[
'userid'
],
tenantname
=
self
.
options
[
'tenantname'
],
password
=
self
.
options
[
'password'
],
password
=
self
.
options
[
'password'
],
domain
=
self
.
options
[
'domain'
],
domain
=
self
.
options
[
'domain'
],
openstack_url
=
self
.
options
[
'openstack_url'
],
openstack_url
=
self
.
options
[
'openstack_url'
],
...
...
slapos/recipe/accords/template/testos.in
View file @
8f1558ff
...
@@ -6,5 +6,6 @@ export ENO_HOST=%(openstack_url)s
...
@@ -6,5 +6,6 @@ export ENO_HOST=%(openstack_url)s
export
ENO_USER
=
%
(
userid
)
s
export
ENO_USER
=
%
(
userid
)
s
export
ENO_PASS
=
%
(
password
)
s
export
ENO_PASS
=
%
(
password
)
s
export
ENO_VERSION
=
v1.1
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
stack/accords/instance-accords.cfg
View file @
8f1558ff
...
@@ -18,9 +18,11 @@ recipe = slapos.cookbook:accords
...
@@ -18,9 +18,11 @@ recipe = slapos.cookbook:accords
userid = cedric.de
userid = cedric.de
password = phahghae
password = phahghae
domain = domain
domain = domain
tenantname = vifib
#userid = $${slap-parameter:userid}
#userid = $${slap-parameter:userid}
#password = $${slap-parameter:password}
#password = $${slap-parameter:password}
#domain = $${slap-parameter:domain}
#domain = $${slap-parameter:domain}
#tenantname = $${slap-parameter:tenantname}
openstack_url = http://beta.enocloud.com:5000/v2.0/
openstack_url = http://beta.enocloud.com:5000/v2.0/
os-config = $${accordsdirectory:accords}/os_config.xml
os-config = $${accordsdirectory:accords}/os_config.xml
listen-ip = $${slap-network-information:local-ipv4}
listen-ip = $${slap-network-information:local-ipv4}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment