Merge pull request #104 from BerkeleyAutomation/fix_generic_ami_launch

added asian pacific amis and  dependencies needed for generic ubuntu images

Former-commit-id: b302895

Author: KeplerC

fogros2/fogros2/aws_cloud_instance.py

@@ -116,9 +116,9 @@ def create(self):
         self.info(flush_to_disk=True)
         self.connect()
         # Uncomment out the next three lines if you are not using a custom AMI
-        #self.install_ros()
-        #self.install_colcon()
-        #self.install_cloud_dependencies()
+        self.install_ros()
+        self.install_cloud_dependencies()
+        self.install_colcon()
         self.push_ros_workspace()
         self.info(flush_to_disk=True)
         self._is_created = True

fogros2/fogros2/cloud_instance.py

@@ -129,6 +129,10 @@ def pip_install(self, args):
 
     def install_cloud_dependencies(self):
         self.apt_install("wireguard unzip docker.io python3-pip ros-humble-rmw-cyclonedds-cpp")
+        self.pip_install("boto3")
+        self.pip_install("paramiko")
+        self.pip_install("scp")
+        self.pip_install("wgconfig")
 
     def install_ros(self):
         # setup sources
@@ -159,7 +163,7 @@ def install_ros(self):
         self.scp.execute_cmd("export LANG=en_US.UTF-8")
 
         # install ros2 packages
-        # self.apt_install(f"ros-{self.ros_distro}-desktop")
+        self.apt_install(f"ros-{self.ros_distro}-desktop")
 
         # source environment
         self.scp.execute_cmd(f"source /opt/ros/{self.ros_distro}/setup.bash")

fogros2_examples/launch/talker.auto_aws.launch.py

@@ -38,10 +38,13 @@
 
 def generic_ubuntu_ami():
     return {
-        "us-west-1": { "ami_image": "ami-01154c8b2e9a14885" },
-        "us-west-2": { "ami_image": "ami-0ddf424f81ddb0720" },
-        "us-east-1": { "ami_image": "ami-08d4ac5b634553e16" },
-        "us-east-2": { "ami_image": "ami-0960ab670c8bb45f3" },
+        "us-west-1": { "ami_image": "ami-02ea247e531eb3ce6" },
+        "us-west-2": { "ami_image": "ami-017fecd1353bcc96e" },
+        "us-east-1": { "ami_image": "ami-08c40ec9ead489470" },
+        "us-east-2": { "ami_image": "ami-097a2df4ac947655f" },
+        "ap-northeast-1": { "ami_image": "ami-03f4fa076d2981b45" }, 
+        "ap-northeast-2": { "ami_image": "ami-0e9bfdb247cc8de84" },
+        "ap-northeast-3": { "ami_image": "ami-08c2ee02329b72f26" },
     }
 
 def generate_launch_description():