From e01f4966b814e626dff423b5b57c73138ce96d8e Mon Sep 17 00:00:00 2001
From: gardlt <gardlt@tetrasol.org>
Date: Wed, 19 Apr 2017 21:24:04 -0500
Subject: [PATCH] [bug] fixing-chart-diff-check

* replacing dup var with correct
* small misname fix
* fixing missing prefix
---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 armada/armada.py                 | 5 +++--
 armada/handlers/tiller.py        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index eae34c21..8a515415 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
 <!--
-      Thanks for contributing to OpenStack-Helm!  Please be thorough
+      Thanks for contributing to Armada!  Please be thorough
       when filling out your pull request. If the purpose for your pull
       request is not clear, we may close your pull request and ask you
       to resubmit.
diff --git a/armada/armada.py b/armada/armada.py
index ab9395c9..5e456470 100644
--- a/armada/armada.py
+++ b/armada/armada.py
@@ -93,7 +93,7 @@ class Armada(object):
                 # do actual update
                 self.tiller.update_release(protoc_chart, self.args.dry_run,
                                            chart.release_name, chart.namespace,
-                                           pre_actions, post_actions,
+                                           prefix, pre_actions, post_actions,
                                            disable_hooks=chart.
                                            upgrade.no_hooks,
                                            values=yaml.safe_dump(values))
@@ -106,6 +106,7 @@ class Armada(object):
                                                 self.args.dry_run,
                                                 chart.release_name,
                                                 chart.namespace,
+                                                prefix,
                                                 values=yaml.safe_dump(values))
                 except Exception:
                     LOG.error("Install failed, continuing.")
@@ -145,4 +146,4 @@ class Armada(object):
             for line in values_diff:
                 LOG.debug(line)
 
-        return (len(chart_diff) > 0) or (len(chart_diff) > 0)
+        return (len(chart_diff) > 0) or (len(values_diff) > 0)
diff --git a/armada/handlers/tiller.py b/armada/handlers/tiller.py
index 152fd974..59383474 100644
--- a/armada/handlers/tiller.py
+++ b/armada/handlers/tiller.py
@@ -134,7 +134,7 @@ class Tiller(object):
         except Exception:
             LOG.debug("POST: Could not create anything, please check yaml")
 
-    def update_release(self, chart, dry_run, name, namespace,
+    def update_release(self, chart, dry_run, name, namespace, prefix,
                        pre_actions=None, post_actions=None,
                        disable_hooks=False, values=None):
         '''
@@ -155,7 +155,7 @@ class Tiller(object):
             dry_run=dry_run,
             disable_hooks=disable_hooks,
             values=values,
-            name=name)
+            name="{}-{}".format(prefix, name))
 
         stub.UpdateRelease(release_request, self.timeout,
                            metadata=self.metadata)