Continuing to work through IAM issues with the jumphost policy template.

HLeeHart · May 29, 2019 · 500a8c6 · 500a8c6
1 parent 842dbec
commit 500a8c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/ClusterMaker/templates/ParallelClusterInstancePolicy.json_src b/ClusterMaker/templates/ParallelClusterInstancePolicy.json_src
@@ -327,7 +327,7 @@
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/parallelcluster-<CLUSTER_NAME>-*",
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/parallelcluster-<CLUSTER_OWNER>-*",
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/pclustermaker-role-<CLUSTER_SERIAL_NUMBER>",
-                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/terminate-pcluster-role-<CLUSTER_SERIAL_NUMBER>"
+                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/kill-pcluster-role-<CLUSTER_SERIAL_NUMBER>"
             ]
         },
         {
@@ -348,7 +348,7 @@
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/parallelcluster-<CLUSTER_NAME>-*",
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/parallelcluster-<CLUSTER_OWNER>-*",
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/pclustermaker-role-<CLUSTER_SERIAL_NUMBER>",
-                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/terminate-pcluster-role-<CLUSTER_SERIAL_NUMBER>"
+                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/kill-pcluster-role-<CLUSTER_SERIAL_NUMBER>"
             ]
         },
         {

diff --git a/JumphostMaker/kill-pcluster-jumphost.jumphost01.sh b/JumphostMaker/kill-pcluster-jumphost.jumphost01.sh
diff --git a/JumphostMaker/templates/JumphostInstancePolicy.json_src b/JumphostMaker/templates/JumphostInstancePolicy.json_src
@@ -326,8 +326,7 @@
             "Resource": [
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/parallelcluster-*",
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/pclustermaker-role-*",
-                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/kill-pclustermaker-role-*",
-                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/terminate-pcluster-role-*"
+                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/kill-pclustermaker-role-*"
             ]
         },
         {
@@ -346,8 +345,7 @@
             "Resource": [
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/parallelcluster-*",
                 "arn:aws:iam::<AWS_ACCOUNT_ID>:role/pclustermaker-role-*",
-                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/pclustermaker-role-*",
-                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/terminate-pcluster-role-*"
+                "arn:aws:iam::<AWS_ACCOUNT_ID>:role/kill-pclustermaker-role-*"
             ]
         },
         {