M #-: Minor OneForm adjustments (#3973)

vickmp · web-flow · commit 8b2747ccf425 · 2025-12-10T14:19:45.000+01:00
diff --git a/share/ansible/plugins/inventory/opennebula_form.py b/share/ansible/plugins/inventory/opennebula_form.py
@@ -48,7 +48,7 @@ def _load_vars(self, vars: dict) -> None:
         try:
             self.form_server  = vars.get('form_server', 'localhost')
             self.one_server   = vars.get('one_server', 'localhost')
-            self.one_version  = vars.get('one_version', None)
+            self.one_version  = vars.get('version', None)
             self.provision_id = int(vars.get('provision_id', -1))
 
             if 'one_auth' in vars:
diff --git a/share/providers/aws/ansible/ansible.cfg b/share/providers/aws/ansible/ansible.cfg
@@ -16,7 +16,6 @@ callbacks_enabled     = profile_tasks
 host_key_checking     = false
 display_skipped_hosts = false
 retry_files_enabled   = false
-stdout_callback       = yaml
 allow_world_readable_tmpfiles = true
 
 [privilege_escalation]
diff --git a/share/providers/aws/ansible/templates/ceph_cluster.j2 b/share/providers/aws/ansible/templates/ceph_cluster.j2
diff --git a/share/providers/aws/terraform/cluster/main.tf b/share/providers/aws/terraform/cluster/main.tf
@@ -21,6 +21,10 @@ resource "aws_subnet" "aws_subnet_device" {
             Name = "provision_subnet_${var.provision_id}"
         }
     )
+
+    timeouts {
+        delete = "30m"
+    }
 }
 
 resource "aws_internet_gateway" "aws_internet_gateway_device" {
@@ -32,12 +36,20 @@ resource "aws_internet_gateway" "aws_internet_gateway_device" {
             Name = "provision_internet_gateway_${var.provision_id}"
         }
     )
+
+    timeouts {
+        delete = "30m"
+    }
 }
 
 resource "aws_route" "aws_route_device" {
     route_table_id         = aws_vpc.aws_vpc_device.main_route_table_id
     destination_cidr_block = "0.0.0.0/0"
     gateway_id             = aws_internet_gateway.aws_internet_gateway_device.id
+
+    timeouts {
+        delete = "30m"
+    }
 }
 
 resource "aws_security_group" "aws_security_group_device_all" {
diff --git a/share/providers/dummy/ansible/ansible.cfg b/share/providers/dummy/ansible/ansible.cfg
@@ -16,7 +16,6 @@ callbacks_enabled     = profile_tasks
 host_key_checking     = false
 display_skipped_hosts = false
 retry_files_enabled   = false
-stdout_callback       = yaml
 allow_world_readable_tmpfiles = true
 
 [privilege_escalation]
diff --git a/share/providers/equinix/ansible/ansible.cfg b/share/providers/equinix/ansible/ansible.cfg
@@ -16,7 +16,6 @@ callbacks_enabled     = profile_tasks
 host_key_checking     = false
 display_skipped_hosts = false
 retry_files_enabled   = false
-stdout_callback       = yaml
 allow_world_readable_tmpfiles = true
 
 [privilege_escalation]
diff --git a/share/providers/i3dnet/ansible/ansible.cfg b/share/providers/i3dnet/ansible/ansible.cfg
@@ -16,7 +16,6 @@ callbacks_enabled     = profile_tasks
 host_key_checking     = false
 display_skipped_hosts = false
 retry_files_enabled   = false
-stdout_callback       = yaml
 allow_world_readable_tmpfiles = true
 
 [privilege_escalation]
diff --git a/share/providers/scaleway/ansible/ansible.cfg b/share/providers/scaleway/ansible/ansible.cfg
@@ -16,7 +16,6 @@ callbacks_enabled     = profile_tasks
 host_key_checking     = false
 display_skipped_hosts = false
 retry_files_enabled   = false
-stdout_callback       = yaml
 allow_world_readable_tmpfiles = true
 
 [privilege_escalation]
diff --git a/src/form/lib/tools/ansible.rb b/src/form/lib/tools/ansible.rb
@@ -52,7 +52,7 @@ def configure(provider, provision, success_cb, failure_cb)
                 tags  = provision.body['onedeploy_tags'] || ONEDEPLOY_TAGS
                 evars = "provision_id=#{provision.id} "
                 evars += "form_server=#{FORM_SERVER} "
-                evars += "one_version=#{OpenNebula::VERSION} "
+                evars += "version=#{OpenNebula::VERSION} "
                 evars += "one_server=#{ONE_SERVER} "
                 evars += "one_auth=#{provision.user_auth}"
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ resource "aws_subnet" "aws_subnet_device" {`
`21`	`21`	`Name = "provision_subnet_${var.provision_id}"`
`22`	`22`	`}`
`23`	`23`	`)`
	`24`	`+`
	`25`	`+ timeouts {`
	`26`	`+ delete = "30m"`
	`27`	`+ }`
`24`	`28`	`}`
`25`	`29`
`26`	`30`	`resource "aws_internet_gateway" "aws_internet_gateway_device" {`
`@@ -32,12 +36,20 @@ resource "aws_internet_gateway" "aws_internet_gateway_device" {`
`32`	`36`	`Name = "provision_internet_gateway_${var.provision_id}"`
`33`	`37`	`}`
`34`	`38`	`)`
	`39`	`+`
	`40`	`+ timeouts {`
	`41`	`+ delete = "30m"`
	`42`	`+ }`
`35`	`43`	`}`
`36`	`44`
`37`	`45`	`resource "aws_route" "aws_route_device" {`
`38`	`46`	`route_table_id = aws_vpc.aws_vpc_device.main_route_table_id`
`39`	`47`	`destination_cidr_block = "0.0.0.0/0"`
`40`	`48`	`gateway_id = aws_internet_gateway.aws_internet_gateway_device.id`
	`49`	`+`
	`50`	`+ timeouts {`
	`51`	`+ delete = "30m"`
	`52`	`+ }`
`41`	`53`	`}`
`42`	`54`
`43`	`55`	`resource "aws_security_group" "aws_security_group_device_all" {`