Merge "Ensure python scripts are py3 compatible"

keystone/templates/bin/_fernet-manage.py.tpl

@@ -82,11 +82,8 @@ def update_secret(name, secret):
 
 
 def read_from_files():
-    keys = filter(
+    keys = [name for name in os.listdir(FERNET_DIR) if os.path.isfile(FERNET_DIR + name)
-        lambda name: os.path.isfile(FERNET_DIR + name) and re.match("^\d+$",
+            and re.match("^\d+$", name)]
-                                                                    name),
-        os.listdir(FERNET_DIR)
-    )
     data = {}
     for key in keys:
         with open(FERNET_DIR + key, 'r') as f:

neutron/templates/bin/_health-probe.py.tpl

@@ -1,18 +1,20 @@
 #!/usr/bin/env python
 
-# Copyright 2019 The Openstack-Helm Authors.
+{{/*
-#
+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.
+Licensed under the Apache License, Version 2.0 (the "License");
-# You may obtain a copy of the License at
+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
+
-#
+    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,
+Unless required by applicable law or agreed to in writing, software
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-# See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
 
 """
 Health probe script for OpenStack agents that uses RPC/unix domain socket for