Add VPC to roboMakerSettings.json

ryanewel · samuelgundry · commit 59e4d623ee7a · 2018-12-14T14:58:16.000-08:00
diff --git a/roboMakerSettings.json b/roboMakerSettings.json
@@ -84,10 +84,15 @@
                }
             },
             "simulation":{
-               "maxJobDurationInSeconds":28800,
+               "outputLocation":"<S3 bucket name for job outputs>",
                "failureBehavior":"Fail",
+               "maxJobDurationInSeconds":28800,
                "iamRole":"<IAM role ARN for RoboMaker>",
-               "outputLocation":"<S3 bucket name for job outputs>"
+               "vpcConfig": {
+                   "assignPublicIp": true,
+                   "securityGroups": [ "<security group id>" ],
+                   "subnets": [ "<subnet id>" ]
+               }
             }
          }
       },
diff --git a/robot_ws/src/cloudwatch_robot/config/cloudwatch_metrics_config.yaml b/robot_ws/src/cloudwatch_robot/config/cloudwatch_metrics_config.yaml
@@ -1,6 +1,6 @@
 # An optional metric namespace parameter. If provided it will set the namespace for all metrics provided by this node to
-# the provided value. If the node is running on a B9 system then the provided launch file will ignore this parameter in
-# favor of the namespace specified by the B9 ecosystem
+# the provided value. If the node is running on a AWS RoboMaker system then the provided launch file will ignore this parameter in
+# favor of the namespace specified by the RoboMaker ecosystem
 aws_metrics_namespace: "robomaker_cloudwatch_monitoring_example"
 
 # An optional list of topics to listen to. If not provided or is empty the node will just listen on the global "metrics"
diff --git a/simulation_ws/src/aws_robomaker_simulation_bookstore/launch/bookstore.launch b/simulation_ws/src/aws_robomaker_simulation_bookstore/launch/bookstore.launch
@@ -1,5 +1,5 @@
 <launch>
-  <!-- Always set GUI to false for B9 Simulation
+  <!-- Always set GUI to false for AWS RoboMaker Simulation
        Use gui:=true on roslaunch command-line to run with a gui.
   -->
   <arg name="gui" default="false"/>
diff --git a/simulation_ws/src/aws_robomaker_simulation_bookstore/launch/bookstore_turtlebot_navigation.launch b/simulation_ws/src/aws_robomaker_simulation_bookstore/launch/bookstore_turtlebot_navigation.launch
@@ -13,7 +13,7 @@
   <arg name="z_pos" value="0.30"/>
 
   <!-- 
-       Always set GUI to false for B9 Simulation
+       Always set GUI to false for AWS RoboMaker Simulation
        Use gui:=true on roslaunch command-line to run with a gui.
   -->
   <arg name="gui" default="false"/>
diff --git a/simulation_ws/src/aws_robomaker_simulation_bookstore/routes/route.yaml b/simulation_ws/src/aws_robomaker_simulation_bookstore/routes/route.yaml
@@ -1,5 +1,5 @@
 # Points throughout the bookstore for navigation. 
-# Compatible with b9_simulations_common route_manager node
+# Compatible with aws_robomaker_simulations_common route_manager node
 mode: random
 poses:
     - pose: 
diff --git a/simulation_ws/src/aws_robomaker_simulation_common/CMakeLists.txt b/simulation_ws/src/aws_robomaker_simulation_common/CMakeLists.txt
@@ -19,7 +19,7 @@ catkin_install_python(PROGRAMS
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
-# Copy the rviz models for easier access in B9 RViz 
+# Copy the rviz models for easier access in AWS RoboMaker RViz 
 install(FILES ${turtlebot3_navigation_DIR}/../rviz/turtlebot3_navigation.rviz
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz
   RENAME turtlebot3_navigation.rviz
diff --git a/simulation_ws/src/cloudwatch_simulation/CMakeLists.txt b/simulation_ws/src/cloudwatch_simulation/CMakeLists.txt
@@ -12,7 +12,7 @@ install(DIRECTORY launch worlds
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
-# Copy the rviz model for easier access in B9 RViz 
+# Copy the rviz model for easier access in AWS RoboMaker RViz 
 install(FILES ${turtlebot3_description_DIR}/../rviz/model.rviz
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz
   RENAME turtlebot3_model.rviz
diff --git a/simulation_ws/src/cloudwatch_simulation/launch/bookstore.launch b/simulation_ws/src/cloudwatch_simulation/launch/bookstore.launch
@@ -3,7 +3,7 @@
        A bookstore with a Turtlebot located initially near the service desk. 
   -->
 
-  <!-- Always set GUI to false for B9 Simulation
+  <!-- Always set GUI to false for AWS RoboMaker Simulation
        Use gui:=true on roslaunch command-line to run with a gui.
   -->
   <arg name="gui" default="false"/>
diff --git a/simulation_ws/src/cloudwatch_simulation/launch/bookstore_turtlebot_navigation.launch b/simulation_ws/src/cloudwatch_simulation/launch/bookstore_turtlebot_navigation.launch
@@ -17,7 +17,7 @@
   <arg name="follow_route" default="true"/>
 
   <!-- 
-       Always set GUI to false for B9 Simulation
+       Always set GUI to false for AWS RoboMaker Simulation
        Use gui:=true on roslaunch command-line to run with a gui.
   -->
   <arg name="gui" default="false"/>
diff --git a/simulation_ws/src/cloudwatch_simulation/launch/empty_world.launch b/simulation_ws/src/cloudwatch_simulation/launch/empty_world.launch
@@ -1,5 +1,5 @@
 <launch>
-  <!-- Always set GUI to false for B9 Simulation
+  <!-- Always set GUI to false for AWS RoboMaker Simulation
        Use gui:=true on roslaunch command-line to run with a gui.
   -->
   <arg name="gui" default="false"/>

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,15 @@`
`84`	`84`	`}`
`85`	`85`	`},`
`86`	`86`	`"simulation":{`
`87`		`- "maxJobDurationInSeconds":28800,`
	`87`	`+ "outputLocation":"<S3 bucket name for job outputs>",`
`88`	`88`	`"failureBehavior":"Fail",`
	`89`	`+ "maxJobDurationInSeconds":28800,`
`89`	`90`	`"iamRole":"<IAM role ARN for RoboMaker>",`
`90`		`- "outputLocation":"<S3 bucket name for job outputs>"`
	`91`	`+ "vpcConfig": {`
	`92`	`+ "assignPublicIp": true,`
	`93`	`+ "securityGroups": [ "<security group id>" ],`
	`94`	`+ "subnets": [ "<subnet id>" ]`
	`95`	`+ }`
`91`	`96`	`}`
`92`	`97`	`}`
`93`	`98`	`},`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ catkin_install_python(PROGRAMS`
`19`	`19`	`DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}`
`20`	`20`	`)`
`21`	`21`
`22`		`-# Copy the rviz models for easier access in B9 RViz`
	`22`	`+# Copy the rviz models for easier access in AWS RoboMaker RViz`
`23`	`23`	`install(FILES ${turtlebot3_navigation_DIR}/../rviz/turtlebot3_navigation.rviz`
`24`	`24`	`DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz`
`25`	`25`	`RENAME turtlebot3_navigation.rviz`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ install(DIRECTORY launch worlds`
`12`	`12`	`DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}`
`13`	`13`	`)`
`14`	`14`
`15`		`-# Copy the rviz model for easier access in B9 RViz`
	`15`	`+# Copy the rviz model for easier access in AWS RoboMaker RViz`
`16`	`16`	`install(FILES ${turtlebot3_description_DIR}/../rviz/model.rviz`
`17`	`17`	`DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz`
`18`	`18`	`RENAME turtlebot3_model.rviz`