From 500a8c673a2a485ba2d13fe8311bda946d459d8a Mon Sep 17 00:00:00 2001
From: Rodney Marable <rodney.marable@gmail.com>
Date: Tue, 28 May 2019 20:58:51 -0400
Subject: [PATCH] Continuing to work through IAM issues with the jumphost
 policy template.

---
 .../templates/ParallelClusterInstancePolicy.json_src        | 4 ++--
 JumphostMaker/kill-pcluster-jumphost.jumphost01.sh          | 1 -
 JumphostMaker/templates/JumphostInstancePolicy.json_src     | 6 ++----
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 120000 JumphostMaker/kill-pcluster-jumphost.jumphost01.sh

diff --git a/ClusterMaker/templates/ParallelClusterInstancePolicy.json_src b/ClusterMaker/templates/ParallelClusterInstancePolicy.json_src
index d54d278..ea5d685 100644
--- 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
deleted file mode 120000
index 5e0012c..0000000
--- a/JumphostMaker/kill-pcluster-jumphost.jumphost01.sh
+++ /dev/null
@@ -1 +0,0 @@
-/Users/rmarable/src/public/ParallelClusterMaker/JumphostMaker/pcluster_jumphost_data/jumphost01/kill_pcluster_jumphost.jumphost01.sh
\ No newline at end of file
diff --git a/JumphostMaker/templates/JumphostInstancePolicy.json_src b/JumphostMaker/templates/JumphostInstancePolicy.json_src
index a26cdf2..5de0a99 100644
--- 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-*"
             ]
         },
         {