heat templates : Remove IAM Policy sections

Some templates have Policies specified for the User
resource in the AWS IAM Policy format, which we do
not yet support, and will confuse users now we have
OS::Heat::AccessPolicy implemented

ref bug 1115758

Change-Id: I6958b02fe6518ea43729ebc18818524ae7e4921e
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/templates/PuppetMaster_Single_Instance.template b/templates/PuppetMaster_Single_Instance.template
index 1d348c415dc93133c1d977623c4952dc0806a5e0..754bbd5c1a22751a6c0e55e01ccee2e1ad9e8020 100644 (file)
--- a/templates/PuppetMaster_Single_Instance.template
+++ b/templates/PuppetMaster_Single_Instance.template
@@ -56,19 +56,7 @@
   },
   "Resources" : {
     "CFNInitUser" : {
-      "Type" : "AWS::IAM::User",
-      "Properties" : {
-        "Policies": [{
-          "PolicyName": "AccessForCFNInit",
-          "PolicyDocument" : {
-            "Statement": [{
-              "Effect"   : "Allow",
-              "Action"   : "cloudformation:DescribeStackResource",
-              "Resource" : "*"
-            }]
-          }
-        }]
-      }
+      "Type" : "AWS::IAM::User"
     },
 
     "CFNKeys" : {

diff --git a/templates/Rails_Single_Instance.template b/templates/Rails_Single_Instance.template
index 5465c515a7635cc5fbdb4ac4699d8aebec880dde..581fa071de32404ce32f9f80fb2e22a8aa4bf879 100644 (file)
--- a/templates/Rails_Single_Instance.template
+++ b/templates/Rails_Single_Instance.template
@@ -94,18 +94,7 @@
   "Resources" : {
 
     "CfnUser" : {
-      "Type" : "AWS::IAM::User",
-      "Properties" : {
-        "Path": "/",
-        "Policies": [{
-          "PolicyName": "root",
-          "PolicyDocument": { "Statement":[{
-            "Effect":"Allow",
-            "Action":"cloudformation:DescribeStackResource",
-            "Resource":"*"
-          }]}
-        }]
-      }
+      "Type" : "AWS::IAM::User"
     },
 
     "HostKeys" : {

diff --git a/templates/WordPress_Single_Instance_puppet.template b/templates/WordPress_Single_Instance_puppet.template
index b6dd3c2ca8bfcf76eb448505aaf687fc49a46672..6f9bc8f34899c335ead71f6e2fd335f612d090d2 100644 (file)
--- a/templates/WordPress_Single_Instance_puppet.template
+++ b/templates/WordPress_Single_Instance_puppet.template
@@ -83,19 +83,7 @@
   "Resources" : {
 
     "CFNInitUser" : {
-      "Type" : "AWS::IAM::User",
-      "Properties" : {
-        "Policies": [{
-          "PolicyName": "AccessForCFNInit",
-          "PolicyDocument" : {
-            "Statement": [{
-              "Effect"   : "Allow",
-              "Action"   : "cloudformation:DescribeStackResource",
-              "Resource" : "*"
-            }]
-          }
-        }]
-      }
+      "Type" : "AWS::IAM::User"
     },
 
     "CFNKeys" : {