From 369e51562f068d5e653211902efc69220508eca1 Mon Sep 17 00:00:00 2001 From: DR695H Date: Wed, 19 Jun 2019 21:16:58 -0400 Subject: move so, clamp, oof to jinja Issue-ID: TEST-158 Change-Id: I88798326879463103a66a97d4ddbc53e864be01a Signed-off-by: DR695H --- robot/assets/templates/so/cloud_config_v3.jinja | 19 +++++++++++++++++++ robot/assets/templates/so/cloud_config_v3.template | 19 ------------------- robot/assets/templates/so/create_cloud_config.jinja | 17 +++++++++++++++++ .../assets/templates/so/create_cloud_config.template | 17 ----------------- 4 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 robot/assets/templates/so/cloud_config_v3.jinja delete mode 100644 robot/assets/templates/so/cloud_config_v3.template create mode 100644 robot/assets/templates/so/create_cloud_config.jinja delete mode 100644 robot/assets/templates/so/create_cloud_config.template (limited to 'robot/assets/templates/so') diff --git a/robot/assets/templates/so/cloud_config_v3.jinja b/robot/assets/templates/so/cloud_config_v3.jinja new file mode 100644 index 00000000..6d445e56 --- /dev/null +++ b/robot/assets/templates/so/cloud_config_v3.jinja @@ -0,0 +1,19 @@ +{ + "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}}" + } +} diff --git a/robot/assets/templates/so/cloud_config_v3.template b/robot/assets/templates/so/cloud_config_v3.template deleted file mode 100644 index 61674589..00000000 --- a/robot/assets/templates/so/cloud_config_v3.template +++ /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}" - } -} diff --git a/robot/assets/templates/so/create_cloud_config.jinja b/robot/assets/templates/so/create_cloud_config.jinja new file mode 100644 index 00000000..aeb6a826 --- /dev/null +++ b/robot/assets/templates/so/create_cloud_config.jinja @@ -0,0 +1,17 @@ +{ + "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}}" + } +} diff --git a/robot/assets/templates/so/create_cloud_config.template b/robot/assets/templates/so/create_cloud_config.template deleted file mode 100644 index 969a8b05..00000000 --- a/robot/assets/templates/so/create_cloud_config.template +++ /dev/null @@ -1,17 +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}" - } -} -- cgit 1.2.3-korg