Added configuration for default ntp and sahara/swift integration

defaults/main.yml

@@ -109,6 +109,11 @@ sahara_use_namespaces: False
 sahara_global_remote_threshold: 100
 sahara_cluster_remote_threshold: 70
 sahara_os_region_name: "{{ sahara_service_region }}"
+sahara_default_ntp_server: "pool.ntp.org"
+ 
+sahara_use_domain_for_proxy_users: True
+sahara_proxy_user_domain_name: sahara_proxy
+sahara_proxy_user_role_names: _member_
 
 # Other plugins can be added to the system by simply extending the list `sahara_plugin_base`.
 sahara_plugin_base:

tasks/sahara_service_setup.yml

@@ -103,3 +103,22 @@
     - sahara-api-setup
     - sahara-service-add
     - sahara-setup
+
+# Create proxy domain
+- name: Ensure sahara_proxy domain
+  keystone:
+    command: "ensure_domain"
+    domain_name: "{{ sahara_proxy_user_domain_name }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
+    endpoint: "{{ keystone_service_adminurl }}"
+    insecure: "{{ keystone_service_adminuri_insecure }}"
+  register: add_sahara_proxy_domain
+  until: add_sahara_proxy_domain|success
+  retries: 5
+  delay: 10
+  when: sahara_use_domain_for_proxy_users|bool
+  tags:
+    - sahara-proxy-domain-add
+    - sahara-setup

templates/sahara.conf.j2

@@ -18,7 +18,12 @@ plugins = {{ sahara_plugin_loaded_base }}
 global_remote_threshold = {{ sahara_global_remote_threshold }}
 cluster_remote_threshold = {{ sahara_cluster_remote_threshold }}
 os_region_name = {{ sahara_os_region_name }}
-
+default_ntp_server = {{ sahara_default_ntp_server }}
+{% if sahara_use_domain_for_proxy_users %}
+use_domain_for_proxy_users = {{ sahara_use_domain_for_proxy_users }}
+proxy_user_domain_name = {{ sahara_proxy_user_domain_name }}
+proxy_user_role_names = {{ sahara_proxy_user_role_names }}
+{% endif %}
 
 [database]
 connection = mysql+pymysql://{{ sahara_galera_user }}:{{ sahara_container_mysql_password }}@{{ sahara_galera_address }}/{{ sahara_galera_database }}?charset=utf8
@@ -36,6 +41,11 @@ project_name = {{ sahara_service_project_name }}
 username = {{ sahara_service_user_name }}
 password = {{ sahara_service_password }}
 
+# parameters needed for trusts creation
+admin_tenant_name = {{ sahara_service_project_name }}
+admin_user = {{ sahara_service_user_name }}
+admin_password = {{ sahara_service_password }}
+
 memcached_servers = {{ memcached_servers }}
 
 token_cache_time = 300