openstack
/
magnum
Code Issues Proposed changes

Fix Trust token scope for drivers 

This fix driver token scope to make sure we use correct token
scope from Trust.

Change-Id: If5b31951959c7a141dc1cae5fefcabe4ebf438b3
This commit is contained in:
ricolin 2023-07-21 10:54:23 +08:00
parent 209f07f1e5
commit eca79453c0
5 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh
View File

@ -62,6 +62,11 @@ function generate_certificates {
"password": "$TRUSTEE_PASSWORD"
}
}
},
"scope": {
"OS-TRUST:trust": {
"id": "$TRUST_ID"
}
}
}
}

5
magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh
View File

@ -98,6 +98,11 @@ function generate_certificates {
"password": "$TRUSTEE_PASSWORD"
}
}
},
"scope": {
"OS-TRUST:trust": {
"id": "$TRUST_ID"
}
}
}
}

6
magnum/drivers/common/templates/swarm/fragments/make-cert.py
View File

@ -161,6 +161,11 @@ def get_user_token(config, verify_ca):
"password": "%(trustee_password)s"
}
}
},
"scope": {
"OS-TRUST:trust": {
"id": "$(trust_id)s"
}
}
}
}
@ -168,6 +173,7 @@ def get_user_token(config, verify_ca):
params = {
'trustee_user_id': config['TRUSTEE_USER_ID'],
'trustee_password': config['TRUSTEE_PASSWORD'],
'trust_id': config['TRUST_ID'],
}
creds = creds_str % params
headers = {'Content-Type': 'application/json'}

5
magnum/drivers/k8s_coreos_v1/templates/fragments/make-cert-client.yaml
View File

@ -73,6 +73,11 @@ write_files:
"password": "$TRUSTEE_PASSWORD"
}
}
},
"scope": {
"OS-TRUST:trust": {
"id": "$TRUST_ID"
}
}
}
}

5
magnum/drivers/k8s_coreos_v1/templates/fragments/make-cert.yaml
View File

@ -104,6 +104,11 @@ write_files:
"password": "$TRUSTEE_PASSWORD"
}
}
},
"scope": {
"OS-TRUST:trust": {
"id": "$TRUST_ID"
}
}
}
}