From b4a422a79812194eb9541bbc5d19c53866e0737b Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Wed, 9 Oct 2019 12:59:28 -0500 Subject: [PATCH] Clean up python script Trivial change. This patch set cleans up a python script. - Move the comment to a helm-template comment so the python comments do not get rendered by helm. - Remove an unused python module. Change-Id: Id287ddae8904d2cfa88725277bb97cf027a942c3 Signed-off-by: Tin Lam --- .../bin/_rabbitmq-password-hash.py.tpl | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl b/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl index 34d13990f..b38f4699e 100644 --- a/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl +++ b/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl @@ -1,21 +1,23 @@ #!/usr/bin/env python -# Copyright 2019 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +{{/* +Copyright 2019 The Openstack-Helm Authors. -# See here for explanation: -# http://lists.rabbitmq.com/pipermail/rabbitmq-discuss/2011-May/012765.html +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +See here for explanation: +http://lists.rabbitmq.com/pipermail/rabbitmq-discuss/2011-May/012765.html +*/}} from __future__ import print_function import base64 @@ -23,7 +25,6 @@ import json import os import hashlib import struct -import sys user = os.environ['RABBITMQ_ADMIN_USERNAME'] password = os.environ['RABBITMQ_ADMIN_PASSWORD']