From 8b90fb6d473c77602fb9bf9cd1abca505d00068d Mon Sep 17 00:00:00 2001 From: Abel Lopez Date: Thu, 16 Feb 2017 00:27:52 -0800 Subject: [PATCH] Change python interpreter There is inconsistent use of either `/usr/bin/python` or `/usr/bin/env python`. This makes for unexpected results when a user might be using a virtualenv. Change-Id: Ibb030f920a8869f9113ade70b66a921cc815060d --- ansible/action_plugins/merge_configs.py | 2 +- ansible/action_plugins/merge_yaml.py | 2 +- ansible/library/bslurp.py | 2 +- ansible/library/kolla_docker.py | 2 +- ansible/library/kolla_toolbox.py | 2 +- ansible/library/merge_configs.py | 2 +- ansible/library/merge_yaml.py | 2 +- ansible/roles/keystone/files/fernet_rotate_cron_generator.py | 2 +- tests/test_kolla_docker.py | 2 +- tests/test_merge_config.py | 2 +- tools/validate-all-file.py | 2 +- tools/validate-yaml.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py index 27fcc53232..da2ab8fb66 100644 --- a/ansible/action_plugins/merge_configs.py +++ b/ansible/action_plugins/merge_configs.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2015 Sam Yaple # Copyright 2017 99Cloud Inc. diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py index 2aca22e964..6ad232af82 100755 --- a/ansible/action_plugins/merge_yaml.py +++ b/ansible/action_plugins/merge_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2015 Sam Yaple # Copyright 2016 intel diff --git a/ansible/library/bslurp.py b/ansible/library/bslurp.py index b117123cd9..b83603d295 100644 --- a/ansible/library/bslurp.py +++ b/ansible/library/bslurp.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2015 Sam Yaple # diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index 28c21a37eb..e41c9b740c 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2015 Sam Yaple # diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py index 2aaef46a3f..458665f35a 100644 --- a/ansible/library/kolla_toolbox.py +++ b/ansible/library/kolla_toolbox.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2016 99cloud Inc. # diff --git a/ansible/library/merge_configs.py b/ansible/library/merge_configs.py index 5da09eed19..1a73e31018 100644 --- a/ansible/library/merge_configs.py +++ b/ansible/library/merge_configs.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2015 Sam Yaple # diff --git a/ansible/library/merge_yaml.py b/ansible/library/merge_yaml.py index 66d316fa51..4d54b437d1 100644 --- a/ansible/library/merge_yaml.py +++ b/ansible/library/merge_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2015 Sam Yaple # Copyright 2016 intel diff --git a/ansible/roles/keystone/files/fernet_rotate_cron_generator.py b/ansible/roles/keystone/files/fernet_rotate_cron_generator.py index da468a8515..c660ff34ec 100644 --- a/ansible/roles/keystone/files/fernet_rotate_cron_generator.py +++ b/ansible/roles/keystone/files/fernet_rotate_cron_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/test_kolla_docker.py b/tests/test_kolla_docker.py index 0a28f63d74..65874f179d 100644 --- a/tests/test_kolla_docker.py +++ b/tests/test_kolla_docker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2016 NEC Corporation # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_merge_config.py b/tests/test_merge_config.py index 6c4af336b5..b972cc9bf7 100644 --- a/tests/test_merge_config.py +++ b/tests/test_merge_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright 2016 99cloud Inc. # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/validate-all-file.py b/tools/validate-all-file.py index e44641291e..b40df3e6f3 100755 --- a/tools/validate-all-file.py +++ b/tools/validate-all-file.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tools/validate-yaml.py b/tools/validate-yaml.py index 6df84ff07d..43156313e5 100755 --- a/tools/validate-yaml.py +++ b/tools/validate-yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.