Fix result handling of ec2_run_instance

actions/workflows/create_vm.yaml

@@ -22,19 +22,23 @@
         instance_type: "{{instance_type}}"
         subnet_id: "{{get_subnet_id.result}}"
         key_name: "{{key_name}}"
+      publish:
+        ec2_instance_id: "{{run_instance.result[0].id}}"
+        ec2_instance_private_ip: "{{run_instance.result[0].private_ip_address}}"
+        ec2_instance_private_dns: "{{run_instance.result[0].private_dns_name}}"
       on-success: "wait_for_instance"
     -
       name: "wait_for_instance"
       ref: "aws.ec2_wait_for_state"
       params:
-        instance_id: "{{run_instance.result[0][0].id}}"
+        instance_id: "{{ec2_instance_id}}"
         state: "running"
       on-success: "wait_for_ssh"
     -
       name: "wait_for_ssh"
       ref: "linux.wait_for_ssh"
       params:
-        hostname: "{{run_instance.result[0][0].private_ip_address}}"
+        hostname: "{{ec2_instance_private_ip}}"
         username: "stanley"
         keyfile: "{{keyfile}}"
         ssh_timeout: 20
@@ -44,38 +48,38 @@
       name: "add_name_tag"
       ref: "aws.ec2_create_tags"
       params:
-        resource_ids: "{{run_instance.result[0][0].id}}"
+        resource_ids: "{{ec2_instance_id}}"
         tags: "Name={{hostname}}"
       on-success: "add_cname"
     -
       name: "add_cname"
       ref: "aws.r53_zone_add_cname"
       params:
         name: "{{hostname}}.{{dns_zone}}"
-        value: "{{run_instance.result[0][0].private_dns_name}}"
+        value: "{{ec2_instance_private_dns}}"
         zone: "{{dns_zone}}"
       on-success: "set_hostname"
     -
       name: "set_hostname"
       ref: "st2cd.set_hostname_cloud"
       params:
         distro: "{{distro}}"
-        hosts: "{{run_instance.result[0][0].private_ip_address}}"
+        hosts: "{{ec2_instance_private_ip}}"
         hostname: "{{hostname}}.{{dns_zone}}"
         timeout: 300
       on-success: "reboot"
     -
       name: "reboot"
       ref: "core.remote_sudo"
       params:
-        hosts: "{{run_instance.result[0][0].private_ip_address}}"
+        hosts: "{{ec2_instance_private_ip}}"
         cmd: "shutdown -r +1 &"
       on-success: "wait_for_ssh_post_reboot"
     -
       name: "wait_for_ssh_post_reboot"
       ref: "linux.wait_for_ssh"
       params:
-        hostname: "{{run_instance.result[0][0].private_ip_address}}"
+        hostname: "{{ec2_instance_private_ip}}"
         username: "stanley"
         keyfile: "{{keyfile}}"
         ssh_timeout: 30

actions/workflows/create_vm_role.yaml

@@ -22,19 +22,23 @@
         instance_type: "{{instance_type}}"
         subnet_id: "{{get_subnet_id.result}}"
         key_name: "{{key_name}}"
+      publish:
+        ec2_instance_id: "{{run_instance.result[0].id}}"
+        ec2_instance_private_ip: "{{run_instance.result[0].private_ip_address}}"
+        ec2_instance_private_dns: "{{run_instance.result[0].private_dns_name}}"
       on-success: "wait_for_instance"
     -
       name: "wait_for_instance"
       ref: "aws.ec2_wait_for_state"
       params:
-        instance_id: "{{run_instance.result[0][0].id}}"
+        instance_id: "{{ec2_instance_id}}"
         state: "running"
       on-success: "wait_for_ssh"
     -
       name: "wait_for_ssh"
       ref: "linux.wait_for_ssh"
       params:
-        hostname: "{{run_instance.result[0][0].private_ip_address}}"
+        hostname: "{{ec2_instance_private_ip}}"
         username: "stanley"
         keyfile: "{{keyfile}}"
         ssh_timeout: 20
@@ -44,38 +48,38 @@
       name: "add_name_tag"
       ref: "aws.ec2_create_tags"
       params:
-        resource_ids: "{{run_instance.result[0][0].id}}"
+        resource_ids: "{{ec2_instance_id}}"
         tags: "Name={{hostname}}"
       on-success: "add_cname"
     -
       name: "add_cname"
       ref: "aws.r53_zone_add_cname"
       params:
         name: "{{hostname}}.{{dns_zone}}"
-        value: "{{run_instance.result[0][0].private_dns_name}}"
+        value: "{{ec2_instance_private_dns}}"
         zone: "{{dns_zone}}"
       on-success: "set_hostname"
     -
       name: "set_hostname"
       ref: "st2cd.set_hostname_cloud"
       params:
         distro: "{{distro}}"
-        hosts: "{{run_instance.result[0][0].private_ip_address}}"
+        hosts: "{{ec2_instance_private_ip}}"
         hostname: "{{hostname}}.{{dns_zone}}"
         timeout: 300
       on-success: "reboot"
     -
       name: "reboot"
       ref: "core.remote_sudo"
       params:
-        hosts: "{{run_instance.result[0][0].private_ip_address}}"
+        hosts: "{{ec2_instance_private_ip}}"
         cmd: "shutdown -r +1 &"
       on-success: "wait_for_ssh_post_reboot"
     -
       name: "wait_for_ssh_post_reboot"
       ref: "linux.wait_for_ssh"
       params:
-        hostname: "{{run_instance.result[0][0].private_ip_address}}"
+        hostname: "{{ec2_instance_private_ip}}"
         username: "stanley"
         keyfile: "{{keyfile}}"
         ssh_timeout: 30
@@ -85,6 +89,6 @@
       name: "puppet_bootstrap"
       ref: "st2cd.puppet_bootstrap"
       params:
-        hosts: "{{run_instance.result[0][0].private_ip_address}}"
+        hostname: "{{ec2_instance_private_ip}}"
         role: "{{role}}"
   default: "get_subnet_id"