diff --git a/snf-deploy/files/etc/synnefo/pithos.conf b/snf-deploy/files/etc/synnefo/pithos.conf index 28594bc79e5468ae28c555216311c7207ff054c4..e2099476876759044eb3782367b5266794cbb663 100644 --- a/snf-deploy/files/etc/synnefo/pithos.conf +++ b/snf-deploy/files/etc/synnefo/pithos.conf @@ -12,3 +12,5 @@ PITHOS_USER_LOGIN_URL = 'https://%ACCOUNTS%/login/' PITHOS_BASE_URL = 'https://%PITHOS%/pithos' ASTAKOS_AUTH_URL = 'https://%ACCOUNTS%/astakos/identity/v2.0' + +PITHOS_OAUTH2_CLIENT_CREDENTIALS = ('pithos-view', '12345') diff --git a/snf-deploy/snfdeploy/__init__.py b/snf-deploy/snfdeploy/__init__.py index 1068e033fb46394270c54b60b26317f9f2707148..53c7e21a4080f9d42cc0d357b6e118892fc98baa 100644 --- a/snf-deploy/snfdeploy/__init__.py +++ b/snf-deploy/snfdeploy/__init__.py @@ -91,7 +91,7 @@ Usage: snf-deploy run <action> [<action>...] setup_hosts setup_nfs_server \ get_auth_token_from_db setup_image_helper update_ns_for_ganeti get_service_details - setup_image_host gnt_instance_add + setup_image_host astakos_register_pithos_view gnt_instance_add setup_iptables gnt_network_add setup_kamaki Test commands: register_image setup_lvm test restart_services @@ -443,6 +443,7 @@ def get_actions(*args): # add_user fails if no groups found "astakos_loaddata", "add_user", "activate_user", "astakos_register_components", + "astakos_register_pithos_view", "setup_cms", "cms_loaddata", "setup_pithos", "setup_vncauthproxy", diff --git a/snf-deploy/snfdeploy/fabfile.py b/snf-deploy/snfdeploy/fabfile.py index 12efa0d36655bbe2aedf8439de3b4f7422a4ce60..84084241983a4ee306ac477a8c6eeabd9cf15d9b 100644 --- a/snf-deploy/snfdeploy/fabfile.py +++ b/snf-deploy/snfdeploy/fabfile.py @@ -609,6 +609,19 @@ def astakos_register_components(): try_run(cmd) +@roles("accounts") +def astakos_register_pithos_view(): + debug(env.host, " * Register pithos view as oauth2 client...") + + pithos_base_url = "https://%s/pithos" % env.env.pithos.fqdn + + cmd = """ + snf-manage oauth2-client-add pithos-view --secret=12345 --is-trusted \ + --url {0} + """.format('%s/ui/view' % pithos_base_url) + try_run(cmd) + + @roles("accounts") def add_user(): debug(env.host, " * adding user %s to astakos..." % env.env.user_email) @@ -679,6 +692,7 @@ EOF snf-manage syncdb --noinput snf-manage migrate im --delete-ghost-migrations snf-manage migrate quotaholder_app + snf-manage migrate oa2 """ try_run(cmd)