From cda591b7145dc0f31215f34e28c0ba54e9258f42 Mon Sep 17 00:00:00 2001 From: Garison Draper Date: Mon, 6 Nov 2017 19:17:25 -0800 Subject: [PATCH] removed last issue 496 items - PR is only for issue 495 now --- docs/config.rst | 6 ++---- stacker/context.py | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/config.rst b/docs/config.rst index ed3ecbb69..1a4da6546 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -113,9 +113,8 @@ that stacker applies), specify an empty map for the top-level keyword:: bucket_tags: {} -Tags updates get applied on every stacker run +S3 Bucket Tags updates get applied on every stacker run -.. _`AWS CloudFormation Resource Tags Type`: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html Module Paths ------------ @@ -274,8 +273,7 @@ If no tags are specified, the `stacker_namespace` tag is applied to your stack with the value of `namespace` as the tag value. If you prefer to apply a custom set of tags, specify the top-level keyword -`tags` as a map. The `stacker_namespace` tag will be automaticly added as well -to help identify resources created by Stacker. Example:: +`tags` as a map. Example:: tags: "hello": world diff --git a/stacker/context.py b/stacker/context.py index 5bc0ad1ce..d76346652 100644 --- a/stacker/context.py +++ b/stacker/context.py @@ -97,9 +97,6 @@ def upload_templates_to_s3(self): def tags(self): tags = self.config.tags if tags is not None: - if "stacker_namespace" in tags: - return tags - tags["stacker_namespace"] = self.namespace return tags if self.namespace: return {"stacker_namespace": self.namespace}