Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
0b116499
Commit
0b116499
authored
Sep 18, 2013
by
Ilias Tsitsimpis
Browse files
snf-deploy: Use the new AstakosClient
parent
4e529d66
Changes
3
Hide whitespace changes
Inline
Side-by-side
snf-deploy/files/etc/synnefo/cyclades.conf
View file @
0b116499
...
...
@@ -20,7 +20,7 @@ NET_BAR_GRAPH_URL = 'https://%HOST%/stats/%s/net-bar.png'
NET_TIMESERIES_GRAPH_URL
=
'https://%HOST%/stats/%s/net-ts.png'
GANETI_DISK_TEMPLATES
= (
'blockdev'
,
'diskless'
,
'drbd'
,
'file'
,
'plain'
,
'rbd'
,
'sharedfile'
,
'ext'
)
ASTAKOS_URL
=
'https://%ACCOUNTS%/i
m/authenticate
'
ASTAKOS_
AUTH_
URL
=
'https://%ACCOUNTS%/i
dentity/v2.0/
'
SECRET_ENCRYPTION_KEY
=
"oEs0pt7Di1mkxA0P6FiK"
...
...
@@ -74,8 +74,6 @@ VMAPI_BASE_URL = 'https://%CYCLADES%/'
CYCLADES_SERVICE_TOKEN
=
"%CYCLADES_SERVICE_TOKEN%"
CYCLADES_USER_CATALOG_URL
=
'https://%ACCOUNTS%/user_catalogs'
# Set False if astakos & cyclades are on the same node
CYCLADES_PROXY_USER_SERVICES
= %
PROXY
%
UI_SYSTEM_IMAGES_OWNERS
= {
'admin@synnefo.gr'
:
'system'
,
...
...
snf-deploy/files/etc/synnefo/pithos.conf
View file @
0b116499
...
...
@@ -9,8 +9,6 @@ PITHOS_SERVICE_TOKEN = '%PITHOS_SERVICE_TOKEN%'
PITHOS_USER_CATALOG_URL
=
'https://%ACCOUNTS%/user_catalogs/'
PITHOS_USER_FEEDBACK_URL
=
'https://%ACCOUNTS%/feedback/'
PITHOS_USER_LOGIN_URL
=
'https://%ACCOUNTS%/login/'
# Set False if astakos & pithos are on the same node
PITHOS_PROXY_USER_SERVICES
= %
PROXY
%
PITHOS_BASE_URL
=
'https://%PITHOS%/pithos'
ASTAKOS_
BASE
_URL
=
'https://%ACCOUNTS%/astakos'
ASTAKOS_
AUTH
_URL
=
'https://%ACCOUNTS%/astakos
/identity/v2.0
'
snf-deploy/snfdeploy/fabfile.py
View file @
0b116499
...
...
@@ -850,7 +850,6 @@ def setup_pithos():
"synnefo_db_passwd"
:
env
.
env
.
synnefo_db_passwd
,
"pithos_dir"
:
env
.
env
.
pithos_dir
,
"PITHOS_SERVICE_TOKEN"
:
service_token
,
"proxy"
:
env
.
env
.
pithos
.
hostname
==
env
.
env
.
accounts
.
hostname
}
custom
=
customize_settings_from_tmpl
(
tmpl
,
replace
)
try_put
(
custom
,
tmpl
,
mode
=
0644
)
...
...
@@ -1161,7 +1160,6 @@ def setup_cyclades():
"HOST"
:
env
.
env
.
cyclades
.
ip
,
"domain"
:
env
.
env
.
domain
,
"CYCLADES_SERVICE_TOKEN"
:
service_token
,
"proxy"
:
env
.
env
.
cyclades
.
hostname
==
env
.
env
.
accounts
.
hostname
}
custom
=
customize_settings_from_tmpl
(
tmpl
,
replace
)
try_put
(
custom
,
tmpl
,
mode
=
0644
)
...
...
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