Manage all Keystone resources with Ansible

Depends-On: I557d8f33c9c699aed14b3b6fc1d1c0407365cd08
Depends-On: Ia68f8852662fb4abbd194954a246afb740bf3f71

Change-Id: I96a3351fca26cd8bb122a86cb4c3a58d5f88573e

deployment/sahara/sahara-api-container-puppet.yaml

@@ -91,6 +91,17 @@ outputs:
           dport:
             - 8386
             - 13386
+      keystone_resources:
+        sahara:
+          endpoints:
+            public: {get_param: [EndpointMap, SaharaPublic, uri]}
+            internal: {get_param: [EndpointMap, SaharaInternal, uri]}
+            admin: {get_param: [EndpointMap, SaharaAdmin, uri]}
+          users:
+            sahara:
+              password: {get_param: SaharaPassword}
+          region: {get_param: KeystoneRegion}
+          service: 'data-processing'
       monitoring_subscription: {get_param: MonitoringSubscriptionSaharaApi}
       config_settings:
         map_merge:
@@ -114,13 +125,6 @@ outputs:
         rsyslog:
           tripleo_logging_sources_sahara_api:
             - {get_param: SaharaApiLoggingSource}
-        keystone:
-          sahara::keystone::auth::tenant: 'service'
-          sahara::keystone::auth::public_url: {get_param: [EndpointMap, SaharaPublic, uri]}
-          sahara::keystone::auth::internal_url: {get_param: [EndpointMap, SaharaInternal, uri]}
-          sahara::keystone::auth::admin_url: {get_param: [EndpointMap, SaharaAdmin, uri]}
-          sahara::keystone::auth::password: {get_param: SaharaPassword }
-          sahara::keystone::auth::region: {get_param: KeystoneRegion}
         mysql:
           sahara::db::mysql::password: {get_param: SaharaPassword}
           sahara::db::mysql::user: sahara