Sync changes to train-staging into train-proudction
Brings in:
- tempest config
- fix for cinder rbd uuid
Note the change to secrets.yml is to add secrets_tempest_user_password
Edited by Will Szumski
Brings in:
Note the change to secrets.yml is to add secrets_tempest_user_password