From: Steven Hardy <shardy@redhat.com>
Date: Thu, 7 Feb 2013 15:54:42 +0000 (+0000)
Subject: heat templates : Remove IAM Policy sections
X-Git-Tag: 2014.1~919
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b85c44274174176d327657259a124d943b9abb3b;p=openstack-build%2Fheat-build.git

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 1d348c41..754bbd5c 100644
--- 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 5465c515..581fa071 100644
--- 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 b6dd3c2c..6f9bc8f3 100644
--- 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" : {