Merge ~aluria/charm-prometheus-openstack-exporter:lp1760800 into ~prometheus-charmers/charm-prometheus-openstack-exporter/+git/prometheus-openstack-exporter-charm:master

[Alvaro Uria]

LP#1760800: Fix keystone v3 env vars for projects

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Peter Sabaini (peter-sabaini)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change must be approved by a member of one of the following teams:
 - canonical-sysadmins
Setting status to needs review.

[Barry Price (barryprice)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision d63d36b05d2a93eaed008e90a5331449eb798320

diff --git a/reactive/openstack_exporter.py b/reactive/openstack_exporter.py
index 7825a02..eeeeacb 100644
--- a/reactive/openstack_exporter.py
+++ b/reactive/openstack_exporter.py
@@ -135,8 +135,6 @@ def get_credentials():
             creds['credentials_user_domain_name'] = config_creds['user_domain_name']
             creds['credentials_project_name'] = config_creds.get(
                 'project_name', 'admin')
-            creds['credentials_api_version'] = config_creds.get(
-                'api_version', identity_api_version)
             creds['credentials_identity_api_version'] = identity_api_version
             creds['credentials_project_domain_name'] = config_creds.get(
                 'project_domain_name', 'admin_domain')
diff --git a/templates/admin.novarc b/templates/admin.novarc
index 0859f4d..819a6c4 100644
--- a/templates/admin.novarc
+++ b/templates/admin.novarc
@@ -1,11 +1,10 @@
 {%- if credentials_identity_api_version == 3 %}
 export OS_USER_DOMAIN_NAME={{ credentials_user_domain_name }}
 export OS_PROJECT_NAME={{ credentials_project_name }}
-export API_VERSION={{ credentials_api_version }}
 export OS_IDENTITY_API_VERSION={{ credentials_identity_api_version }}
 export OS_PROJECT_DOMAIN_NAME={{ credentials_project_domain_name }}
-export PROJECT_ID={{ credentials_project_id }}
-export PROJECT_DOMAIN_ID={{ credentials_project_domain_id }}
+export OS_PROJECT_ID={{ credentials_project_id }}
+export OS_PROJECT_DOMAIN_ID={{ credentials_project_domain_id }}
 {%- endif %}
 
 export OS_USERNAME={{ credentials_username }}