diff options
Diffstat (limited to 'robot/assets')
-rw-r--r-- | robot/assets/templates/so/cloud_config_v3.jinja | 19 | ||||
-rw-r--r-- | robot/assets/templates/so/create_cloud_config.jinja | 6 |
2 files changed, 6 insertions, 19 deletions
diff --git a/robot/assets/templates/so/cloud_config_v3.jinja b/robot/assets/templates/so/cloud_config_v3.jinja deleted file mode 100644 index dfd3fbba..00000000 --- a/robot/assets/templates/so/cloud_config_v3.jinja +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "{{site_name}}", - "region_id": "{{region_id}}", - "aic_version": "2.5", - "clli": "{{clli}}", - "identityService": { - "identity_url": "{{identity_url}}", - "mso_id": "{{mso_id}}", - "mso_pass": "{{mso_pass}}", - "admin_tenant": "{{admin_tenant}}", - "member_role": "{{member_role}}", - "tenant_meta_data": true, - "id": "{{identity_id}}", - "identity_server_type": "{{identity_server_type}}", - "identity_authentication_type": "{{authentication_type}}", - "project_domain_name": "{{project_domain_name}}", - "user_domain_name": "{{user_domain_name}}" - } -}
\ No newline at end of file diff --git a/robot/assets/templates/so/create_cloud_config.jinja b/robot/assets/templates/so/create_cloud_config.jinja index 2e73dada..957141e8 100644 --- a/robot/assets/templates/so/create_cloud_config.jinja +++ b/robot/assets/templates/so/create_cloud_config.jinja @@ -13,5 +13,11 @@ "id": "{{identity_id}}", "identity_server_type": "{{identity_server_type}}", "identity_authentication_type": "{{authentication_type}}" + {% if project_domain_name %} + ,"project_domain_name": "{{project_domain_name}}" + {% endif %} + {% if user_domain_name %} + ,"user_domain_name": "{{user_domain_name}}" + {% endif %} } }
\ No newline at end of file |