Merge pull request #3 from NVIDIA-Omniverse/develop

Develop -> Main

Dockerfile

@@ -93,3 +93,4 @@ WORKDIR /app
 ENTRYPOINT [ "/bin/sh", "-c" ]
 
 ENV VERSION="v2.3.0"
+

deploy-alicloud

@@ -255,6 +255,9 @@ class AlicloudDeployer(Deployer):
         if self.params["upload"]:
             self.upload_user_data()
 
+        # run autorun
+        self.run_autorun_ansible()
+
         # print info for the user
         self.output_deployment_info()
 

deploy-aws

@@ -255,6 +255,9 @@ class AWSDeployer(Deployer):
         if self.params["upload"]:
             self.upload_user_data()
 
+        # run autorun
+        self.run_autorun_ansible()
+
         # print info for the user
         self._output_deployment_info()
 

deploy-azure

@@ -215,6 +215,9 @@ class AzureDeployer(Deployer):
         if self.params["upload"]:
             self.upload_user_data()
 
+        # run autorun
+        self.run_autorun_ansible()
+
         # connection info for the user
         self.output_deployment_info()
 

deploy-gcp

@@ -197,6 +197,9 @@ class GCPDeployer(Deployer):
         if self.params["upload"]:
             self.upload_user_data()
 
+        # run autorun
+        self.run_autorun_ansible()
+
         # connection info for the user
         self.output_deployment_info()
 

src/ansible/roles/isaac/tasks/isaac_app.yml

@@ -74,17 +74,22 @@
 
 - name: Start Application
   shell: |
-    export DISPLAY=":0"
-
     if [ -f /home/{{ ansible_user }}/uploads/autorun.sh ]; then
-      # if autorun file is uploaded, run it
+      # if autorun script is present, run it
       CMD="/home/{{ ansible_user }}/uploads/autorun.sh"
-      chmod +x "$CMD"
     else
       # otherwise, run Isaac Sim with default options
-      CMD="/home/{{ ansible_user }}/uploads/isaacsim.sh"
+      CMD="/home/{{ ansible_user }}/Desktop/isaacsim.sh"
     fi
 
+    chmod +x "$CMD"
+    export DISPLAY=:0
+
+    # wait for display to become available
+    while ! xset q > /dev/null 2>&1 ; do
+      echo "Waiting for the display to become available..."
+      sleep 1
+    done
     # run in a terminal on desktop
     gnome-terminal -- bash -c "$CMD; exec bash"
   args:
@@ -94,4 +99,4 @@
   tags:
     - skip_in_image
     - on_stop_start
-    - _autorun
+    - autorun

src/python/deployer.py

@@ -235,20 +235,22 @@ def create_tfvars(self, tfvars: dict = {}):
         # default values common for all clouds
         tfvars.update(
             {
-                "isaac_enabled": self.params["isaac"]
-                if "isaac" in self.params
-                else False,
+                "isaac_enabled": (
+                    self.params["isaac"] if "isaac" in self.params else False
+                ),
                 #
-                "isaac_instance_type": self.params["isaac_instance_type"]
-                if "isaac_instance_type" in self.params
-                else "none",
+                "isaac_instance_type": (
+                    self.params["isaac_instance_type"]
+                    if "isaac_instance_type" in self.params
+                    else "none"
+                ),
                 #
                 "prefix": self.params["prefix"],
                 "ssh_port": self.params["ssh_port"],
                 #
-                "from_image": self.params["from_image"]
-                if "from_image" in self.params
-                else False,
+                "from_image": (
+                    self.params["from_image"] if "from_image" in self.params else False
+                ),
                 #
                 "deployment_name": self.params["deployment_name"],
             }
@@ -412,17 +414,33 @@ def export_ssh_key(self):
             verbose=debug,
         )
 
-    def run_ansible(self, playbook_name: str, cwd: str):
+    def run_ansible(
+        self,
+        playbook_name: str,
+        cwd: str,
+        tags: [str] = [],
+        skip_tags: [str] = [],
+    ):
         """
         Run Ansible playbook via shell command
         """
 
         debug = self.params["debug"]
         deployment_name = self.params["deployment_name"]
 
+        if len(tags) > 0:
+            tags = ",".join([f'--tags "{tag}"' for tag in tags])
+        else:
+            tags = ""
+
+        if len(skip_tags) > 0:
+            skip_tags = ",".join([f'--skip-tags "{tag}"' for tag in skip_tags])
+        else:
+            skip_tags = ""
+
         shell_command(
             f"ansible-playbook -i {self.config['state_dir']}/{deployment_name}/.inventory "
-            + f"{playbook_name}.yml {'-vv' if self.params['debug'] else ''}",
+            + f"{playbook_name}.yml {tags} {skip_tags} {'-vv' if self.params['debug'] else ''}",
             cwd=cwd,
             verbose=debug,
         )
@@ -431,14 +449,28 @@ def run_all_ansible(self):
         # run ansible for isaac
         if "isaac" in self.params and self.params["isaac"]:
             click.echo(colorize_info("* Running Ansible for Isaac Sim..."))
-            self.run_ansible(playbook_name="isaac", cwd=f"{self.config['ansible_dir']}")
+            self.run_ansible(
+                playbook_name="isaac",
+                cwd=f"{self.config['ansible_dir']}",
+                skip_tags=["autorun"],  # autorun should be executed after the upload
+            )
 
         # run ansible for ovami
         # todo: move to ./deploy-aws
         if "ovami" in self.params and self.params["ovami"]:
             click.echo(colorize_info("* Running Ansible for OV AMI..."))
             self.run_ansible(playbook_name="ovami", cwd=f"{self.config['ansible_dir']}")
 
+    def run_autorun_ansible(self):
+        # run ansible for isaac
+        if "isaac" in self.params and self.params["isaac"]:
+            click.echo(colorize_info("* Running autorun Ansible for Isaac Sim..."))
+            self.run_ansible(
+                playbook_name="isaac",
+                cwd=f"{self.config['ansible_dir']}",
+                tags=["autorun"],
+            )
+
     def tf_output(self, key: str, default: str = ""):
         """
         Read Terraform output.

uploads/autorun.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# This script is executed when
+# 1. the VM is first deployed
+# 2. the VM is started after being stopped
+
 # replace with your own command
 # for example:
 #  ~ubuntu/Desktop/isaacsim.sh --cmd="/isaac-sim/kit/kit /isaac-sim/apps/omni.isaac.sim.kit --allow-root"