From 5493908641751650dd977bf4a43aaa98a9f0b5db Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 18 Mar 2024 18:02:57 +0100 Subject: [PATCH] Lifeary: change the name of the NFS shares. --- openstack-tf/d4s-preprod/liferay/main.tf | 2 + .../d4s-preprod/liferay/terraform.tfstate | 24 +++++----- openstack-tf/d4s-production/liferay/main.tf | 2 + .../d4s-production/liferay/terraform.tfstate | 45 ++++++++++--------- 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/openstack-tf/d4s-preprod/liferay/main.tf b/openstack-tf/d4s-preprod/liferay/main.tf index 60cd6d4..3905f4c 100644 --- a/openstack-tf/d4s-preprod/liferay/main.tf +++ b/openstack-tf/d4s-preprod/liferay/main.tf @@ -25,6 +25,8 @@ module "liferay" { vm_count = 2 vm_flavor = "m1.large" boot_vol_size = 30 + share_description = "NFS share for the liferay preprod static data" + share_name = "liferay_pre_nfs_share" } liferay_ip_addrs = ["10.1.32.24", "10.1.32.25"] diff --git a/openstack-tf/d4s-preprod/liferay/terraform.tfstate b/openstack-tf/d4s-preprod/liferay/terraform.tfstate index 06f9fff..ab05455 100644 --- a/openstack-tf/d4s-preprod/liferay/terraform.tfstate +++ b/openstack-tf/d4s-preprod/liferay/terraform.tfstate @@ -1,13 +1,15 @@ { "version": 4, "terraform_version": "1.6.6", - "serial": 56, + "serial": 60, "lineage": "2cef4407-f7f5-0a46-74de-03956dd178ed", "outputs": { "liferay_data": { "value": { "affinity_policy": "soft-anti-affinity", "boot_vol_size": "30", + "share_description": "NFS share for the liferay preprod static data", + "share_name": "liferay_pre_nfs_share", "srv_name": "lr62", "vm_count": "2", "vm_flavor": "m1.large" @@ -168,7 +170,7 @@ "value": { "all_metadata": {}, "availability_zone": "nova", - "description": "NFS share for the liferay static data", + "description": "NFS share for the liferay preprod static data", "export_locations": [ { "path": "172.17.0.7:/volumes/_nogroup/40293496-74da-4023-a428-563a5bea3d7a/008c093f-ce76-43c8-aa00-5c3f57a66244", @@ -180,7 +182,7 @@ "id": "d42079f9-c77c-4b61-ba8e-f2df987ef9bf", "is_public": false, "metadata": null, - "name": "liferay_nfs_share", + "name": "liferay_pre_nfs_share", "project_id": "6fdc02e2827b405dad99f34698659742", "region": "isti_area_pi_1", "replication_type": "", @@ -2125,8 +2127,8 @@ } ], "description": "", - "device_id": "", - "device_owner": "", + "device_id": "aaf50b2a-40e2-4bbe-8e4e-39f5d83dd08f", + "device_owner": "compute:cnr-isti-nova-a", "dns_assignment": [ { "fqdn": "host-192-168-11-79.openstacklocal.", @@ -2152,7 +2154,7 @@ "qos_policy_id": "", "region": "isti_area_pi_1", "security_group_ids": null, - "tags": null, + "tags": [], "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null, "value_specs": null @@ -2186,8 +2188,8 @@ } ], "description": "", - "device_id": "", - "device_owner": "", + "device_id": "0b9deb27-50ba-409f-a9a7-b3a55b5e5b29", + "device_owner": "compute:cnr-isti-nova-a", "dns_assignment": [ { "fqdn": "host-192-168-11-153.openstacklocal.", @@ -2213,7 +2215,7 @@ "qos_policy_id": "", "region": "isti_area_pi_1", "security_group_ids": null, - "tags": null, + "tags": [], "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null, "value_specs": null @@ -2502,7 +2504,7 @@ "attributes": { "all_metadata": {}, "availability_zone": "nova", - "description": "NFS share for the liferay static data", + "description": "NFS share for the liferay preprod static data", "export_locations": [ { "path": "172.17.0.7:/volumes/_nogroup/40293496-74da-4023-a428-563a5bea3d7a/008c093f-ce76-43c8-aa00-5c3f57a66244", @@ -2514,7 +2516,7 @@ "id": "d42079f9-c77c-4b61-ba8e-f2df987ef9bf", "is_public": false, "metadata": null, - "name": "liferay_nfs_share", + "name": "liferay_pre_nfs_share", "project_id": "6fdc02e2827b405dad99f34698659742", "region": "isti_area_pi_1", "replication_type": "", diff --git a/openstack-tf/d4s-production/liferay/main.tf b/openstack-tf/d4s-production/liferay/main.tf index 912c639..07c74c8 100644 --- a/openstack-tf/d4s-production/liferay/main.tf +++ b/openstack-tf/d4s-production/liferay/main.tf @@ -25,6 +25,8 @@ module "liferay" { vm_count = 2 vm_flavor = "m1.large" boot_vol_size = 30 + share_description = "NFS share for the liferay production static data" + share_name = "liferay_production_nfs_share" } liferay_ip_addrs = ["10.1.40.40", "10.1.40.41"] diff --git a/openstack-tf/d4s-production/liferay/terraform.tfstate b/openstack-tf/d4s-production/liferay/terraform.tfstate index 2a884c8..ae5cd1b 100644 --- a/openstack-tf/d4s-production/liferay/terraform.tfstate +++ b/openstack-tf/d4s-production/liferay/terraform.tfstate @@ -1,13 +1,15 @@ { "version": 4, "terraform_version": "1.6.6", - "serial": 36, + "serial": 40, "lineage": "1ad5c30b-f952-53b5-f9cd-fe7cb4117b8b", "outputs": { "liferay_data": { "value": { "affinity_policy": "anti-affinity", "boot_vol_size": "30", + "share_description": "NFS share for the liferay production static data", + "share_name": "liferay_production_nfs_share", "srv_name": "lr62", "vm_count": "2", "vm_flavor": "m1.large" @@ -168,7 +170,7 @@ "value": { "all_metadata": {}, "availability_zone": "nova", - "description": "NFS share for the liferay static data", + "description": "NFS share for the liferay production static data", "export_locations": [ { "path": "172.17.0.7:/volumes/_nogroup/6ab15bf6-334c-45d6-aa21-c66d3d3ecd7d/430e5895-56ee-46fd-9a5f-b8ee5f261bae", @@ -180,7 +182,7 @@ "id": "02826d11-1ec4-48bf-82bb-0d7680d8c325", "is_public": false, "metadata": null, - "name": "liferay_nfs_share", + "name": "liferay_production_nfs_share", "project_id": "1b45adf388934758b56d0dfdb4bfacf3", "region": "isti_area_pi_1", "replication_type": "", @@ -1849,7 +1851,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -1866,10 +1868,10 @@ "traffic_from_the_main_load_balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2024-03-12 14:17:52 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "user_data": "", "vendor_options": [], "volume": [] }, @@ -1947,7 +1949,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -1964,10 +1966,10 @@ "traffic_from_the_main_load_balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2024-03-12 14:17:54 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "user_data": "", "vendor_options": [], "volume": [] }, @@ -2100,7 +2102,10 @@ "schema_version": 0, "attributes": { "id": "1b01f699-f10e-4953-815a-07d6fae0f7be", - "members": [], + "members": [ + "ea9349dd-09fe-4559-9ea2-d7ea421b40e4", + "b86618ec-3c38-4694-a198-fb70ccf98bb3" + ], "name": "liferay", "policies": [ "anti-affinity" @@ -2239,8 +2244,8 @@ } ], "description": "", - "device_id": "", - "device_owner": "", + "device_id": "ea9349dd-09fe-4559-9ea2-d7ea421b40e4", + "device_owner": "compute:cnr-isti-nova-a", "dns_assignment": [ { "fqdn": "host-172-17-2-239.openstacklocal.", @@ -2301,8 +2306,8 @@ } ], "description": "", - "device_id": "", - "device_owner": "", + "device_id": "b86618ec-3c38-4694-a198-fb70ccf98bb3", + "device_owner": "compute:cnr-isti-nova-a", "dns_assignment": [ { "fqdn": "host-172-17-0-68.openstacklocal.", @@ -2371,8 +2376,8 @@ } ], "description": "", - "device_id": "", - "device_owner": "", + "device_id": "ea9349dd-09fe-4559-9ea2-d7ea421b40e4", + "device_owner": "compute:cnr-isti-nova-a", "dns_assignment": [ { "fqdn": "host-192-168-11-203.openstacklocal.", @@ -2432,8 +2437,8 @@ } ], "description": "", - "device_id": "", - "device_owner": "", + "device_id": "b86618ec-3c38-4694-a198-fb70ccf98bb3", + "device_owner": "compute:cnr-isti-nova-a", "dns_assignment": [ { "fqdn": "host-192-168-11-141.openstacklocal.", @@ -2748,7 +2753,7 @@ "attributes": { "all_metadata": {}, "availability_zone": "nova", - "description": "NFS share for the liferay static data", + "description": "NFS share for the liferay production static data", "export_locations": [ { "path": "172.17.0.7:/volumes/_nogroup/6ab15bf6-334c-45d6-aa21-c66d3d3ecd7d/430e5895-56ee-46fd-9a5f-b8ee5f261bae", @@ -2760,7 +2765,7 @@ "id": "02826d11-1ec4-48bf-82bb-0d7680d8c325", "is_public": false, "metadata": null, - "name": "liferay_nfs_share", + "name": "liferay_production_nfs_share", "project_id": "1b45adf388934758b56d0dfdb4bfacf3", "region": "isti_area_pi_1", "replication_type": "",