Trim trailing slash from ASTAKOS_AUTH_URL

Endpoints no more end in slash.

docs/scale/i-pithos.rst

@@ -56,7 +56,7 @@ In `/etc/synnefo/pithos.conf` add:
 
 .. code-block:: console
 
-    ASTAKOS_AUTH_URL = 'https://accounts.example.com/identity/v2.0/'
+    ASTAKOS_AUTH_URL = 'https://accounts.example.com/identity/v2.0'
 
     PITHOS_BACKEND_DB_CONNECTION = 'postgresql://synnefo:example_passw0rd@db.example.com:5432/snf_pithos'
     PITHOS_BACKEND_BLOCK_PATH = '/srv/pithos/data'

docs/snf-burnin.rst

@@ -28,7 +28,7 @@ A typical usage of snf-burnin is:
 ::
 
   snf-burnin --token=USERS_SECRET_TOKEN \
-             --auth-url="https://accounts.synnefo.org/identity/v2.0/" \
+             --auth-url="https://accounts.synnefo.org/identity/v2.0" \
              --system-images-user=SYSTEM_IMAGES_USER_ID \
              --image-id=IMAGE_ID \
              --log-folder=LOG_FOLDER

docs/upgrade/upgrade-0.15.rst

@@ -110,11 +110,11 @@ Pithos services) with the ``ASTAKOS_AUTH_URL`` setting.
 
 For Cyclades service we have to change the ``20-snf-cyclades-app-api.conf``
 file, remove the ``ASTAKOS_BASE_URL`` setting and replace it with
-``ASTAKOS_AUTH_URL``. Typically it is sufficient to add ``/identity/v2.0/``
+``ASTAKOS_AUTH_URL``. Typically it is sufficient to add ``/identity/v2.0``
 at the end of base url to get the auth url. For example if base url had the
 value of 'https://accounts.example.synnefo.org/' then the ``ASTAKOS_AUTH_URL``
 setting will have the value of
-'https://accounts.example.synnefo.org/identity/v2.0/'.
+'https://accounts.example.synnefo.org/identity/v2.0'.
 
 For Pithos service we have to change the ``20-snf-pithos-app-settings.conf``
 file in the same way as above.

snf-common/synnefo/settings/test.py

@@ -58,7 +58,7 @@ ASTAKOS_IM_MODULES = ['local', 'shibboleth']
 
 
 ASTAKOS_BASE_URL = 'http://accounts.example.synnefo.org/astakos/'
-ASTAKOS_AUTH_URL = 'http://accounts.example.synnefo.org/astakos/identity/v2.0/'
+ASTAKOS_AUTH_URL = 'http://accounts.example.synnefo.org/astakos/identity/v2.0'
 COMPUTE_BASE_URL = 'http://compute.example.synnefo.org/cyclades/'
 PITHOS_BASE_URL = 'http://storage.example.synnefo.org/pithos/'
 

snf-cyclades-app/conf/20-snf-cyclades-app-api.conf

@@ -83,7 +83,7 @@
 #
 #
 ## Authentication URL of the astakos instance to be used for user management
-#ASTAKOS_AUTH_URL = 'https://accounts.example.synnefo.org/identity/v2.0/'
+#ASTAKOS_AUTH_URL = 'https://accounts.example.synnefo.org/identity/v2.0'
 #
 ## Key for password encryption-decryption. After changing this setting, synnefo
 ## will be unable to decrypt all existing Backend passwords. You will need to

snf-cyclades-app/synnefo/cyclades_settings.py

@@ -71,7 +71,7 @@ COMPUTE_ROOT_URL = join_urls(BASE_URL, COMPUTE_PREFIX)
 
 ASTAKOS_AUTH_URL = getattr(
     settings, 'ASTAKOS_AUTH_URL',
-    'https://accounts.example.synnefo.org/astakos/identity/v2.0/')
+    'https://accounts.example.synnefo.org/astakos/identity/v2.0')
 
 
 # --------------------------------------

snf-deploy/files/etc/synnefo/cyclades.conf

@@ -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_AUTH_URL = 'https://%ACCOUNTS%/identity/v2.0/'
+ASTAKOS_AUTH_URL = 'https://%ACCOUNTS%/identity/v2.0'
 
 SECRET_ENCRYPTION_KEY= "oEs0pt7Di1mkxA0P6FiK"
 

snf-deploy/snfdeploy/fabfile.py

@@ -1309,7 +1309,7 @@ def setup_kamaki():
     install_package("python-progress")
     install_package("kamaki")
     cmd = """
-    kamaki config set cloud.default.url "https://{0}/astakos/identity/v2.0/"
+    kamaki config set cloud.default.url "https://{0}/astakos/identity/v2.0"
     kamaki config set cloud.default.token {1}
     """.format(env.env.accounts.fqdn, user_auth_token)
     try_run(cmd)

snf-pithos-app/conf/20-snf-pithos-app-settings.conf

@@ -2,7 +2,7 @@
 #PITHOS_BASE_URL = "https://pithos.example.synnefo.org/"
 
 # Top-level URL for the Astakos instance to be used for user management
-#ASTAKOS_AUTH_URL = 'https://accounts.example.synnefo.org/identity/v2.0/'
+#ASTAKOS_AUTH_URL = 'https://accounts.example.synnefo.org/identity/v2.0'
 
 # Cookie name to search for fallback token
 #PITHOS_ASTAKOS_COOKIE_NAME = '_pithos2_a'

snf-pithos-app/pithos/api/settings.py

@@ -34,7 +34,7 @@ COOKIE_NAME = getattr(settings, 'PITHOS_ASTAKOS_COOKIE_NAME', '_pithos2_a')
 
 ASTAKOS_AUTH_URL = getattr(
     settings, 'ASTAKOS_AUTH_URL',
-    'https://accounts.example.synnefo.org/astakos/identity/v2.0/')
+    'https://accounts.example.synnefo.org/astakos/identity/v2.0')
 
 ASTAKOSCLIENT_POOLSIZE = \
     getattr(settings, 'PITHOS_ASTAKOSCLIENT_POOLSIZE', 200)

snf-tools/conf/snf-burnin-run.sh

@@ -34,7 +34,7 @@ FAILURE_SUBJECT="Burnin Failed"
 
 # ----------------------------------------
 # Some burnin parameters
-AUTH_URL="https://accounts.synnefo.org/identity/v2.0/"
+AUTH_URL="https://accounts.synnefo.org/identity/v2.0"
 SYSTEM_IMAGES_USER="uuid-of-owner-of-system-images"
 TIMEOUT=240