add provider prefix to wildcard

files/geant_acme_uploader.py

@@ -135,9 +135,10 @@ if __name__ == "__main__":
     if ARGS['--wildcard']:
         CLIENT = ['common']
         WILDCARD = 'wildcard_'
+        PROVIDER_PREFIX = '{}_'.format(PROVIDER)
     else:
         CLIENT = ARGS['--client']
-        WILDCARD = ''
+        WILDCARD = PROVIDER_PREFIX = ''
 
     CONFIG = configparser.RawConfigParser()
     CONFIG.read_file(open('/root/.geant_acme.ini'))
@@ -180,8 +181,8 @@ if __name__ == "__main__":
                 domain_underscored = DOMAIN.replace('.', '_')
                 certname_renamed = certname.replace(
                     'cert.pem', 'pem').replace('.', '_')
-                redis_full_path = '{}:redis_{}_{}'.format(
-                    CLIENT_ITEM, domain_underscored, certname_renamed)
+                redis_full_path = '{}:redis_{}{}_{}'.format(
+                    CLIENT_ITEM, PROVIDER_PREFIX, domain_underscored, certname_renamed)
                 certdata_upstream = redis_download(REDIS_HOST, REDIS_TOKEN, redis_full_path)
 
                 if certdata_local != certdata_upstream:
@@ -194,8 +195,8 @@ if __name__ == "__main__":
         with open(KEYPATH, 'r') as keyfile:
             KEYDATA_LOCAL = keyfile.read()
             DOMAIN_UNDERSCORED = DOMAIN.replace('.', '_')
-            VAULT_FULL_PATH = 'puppet/{}/vault_{}{}_key'.format(
-                CLIENT_ITEM, WILDCARD, DOMAIN_UNDERSCORED)
+            VAULT_FULL_PATH = 'puppet/{}/vault_{}{}{}_key'.format(
+                CLIENT_ITEM, PROVIDER_PREFIX, WILDCARD, DOMAIN_UNDERSCORED)
             KEYDATA_UPSTREAM = vault_dowload(VAULT_HOST, VAULT_TOKEN, VAULT_FULL_PATH)
 
             if KEYDATA_LOCAL != KEYDATA_UPSTREAM: