diff options
| author | Steve Baker <sbaker@redhat.com> | 2012-12-28 10:14:12 +1300 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2012-12-28 10:14:12 +1300 |
| commit | d8a6d6e74144401838b848de3d9ba0d0fb3fd6d9 (patch) | |
| tree | 64b564e09e0b7110c5f17cb47cf5c23fc7814b19 /bin | |
| parent | 2f412a364aee7be5773f90534f44656383cac348 (diff) | |
| download | heat-cfntools-d8a6d6e74144401838b848de3d9ba0d0fb3fd6d9.tar.gz | |
Always import cfn_helper from heat_cfntools.cfntools
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cfn-get-metadata | 6 | ||||
| -rwxr-xr-x | bin/cfn-hup | 6 | ||||
| -rwxr-xr-x | bin/cfn-init | 6 | ||||
| -rwxr-xr-x | bin/cfn-push-stats | 6 | ||||
| -rwxr-xr-x | bin/cfn-signal | 6 |
5 files changed, 5 insertions, 25 deletions
diff --git a/bin/cfn-get-metadata b/bin/cfn-get-metadata index d8d4006..8c88e0c 100755 --- a/bin/cfn-get-metadata +++ b/bin/cfn-get-metadata @@ -23,11 +23,7 @@ import os.path import sys -if os.path.exists('/opt/aws/bin'): - sys.path.insert(0, '/opt/aws/bin') - from cfn_helper import * -else: - from heat_cfntools.cfntools.cfn_helper import * +from heat_cfntools.cfntools.cfn_helper import * description = " " parser = argparse.ArgumentParser(description=description) diff --git a/bin/cfn-hup b/bin/cfn-hup index 8487753..9e31a52 100755 --- a/bin/cfn-hup +++ b/bin/cfn-hup @@ -23,11 +23,7 @@ import os.path import sys -if os.path.exists('/opt/aws/bin'): - sys.path.insert(0, '/opt/aws/bin') - from cfn_helper import * -else: - from heat_cfntools.cfntools.cfn_helper import * +from heat_cfntools.cfntools.cfn_helper import * description = " " parser = argparse.ArgumentParser(description=description) diff --git a/bin/cfn-init b/bin/cfn-init index 4af16c6..72f499a 100755 --- a/bin/cfn-init +++ b/bin/cfn-init @@ -21,11 +21,7 @@ import os import sys -if os.path.exists('/opt/aws/bin'): - sys.path.insert(0, '/opt/aws/bin') - from cfn_helper import * -else: - from heat_cfntools.cfntools.cfn_helper import * +from heat_cfntools.cfntools.cfn_helper import * description = " " parser = argparse.ArgumentParser(description=description) diff --git a/bin/cfn-push-stats b/bin/cfn-push-stats index 51f490f..6fe085f 100755 --- a/bin/cfn-push-stats +++ b/bin/cfn-push-stats @@ -41,11 +41,7 @@ except ImportError: LOG.warn("psutil not available. If you want process and memory " "statistics, you need to install it.") -if os.path.exists('/opt/aws/bin'): - sys.path.insert(0, '/opt/aws/bin') - from cfn_helper import * -else: - from heat_cfntools.cfntools.cfn_helper import * +from heat_cfntools.cfntools.cfn_helper import * KILO = 1024 MEGA = 1048576 diff --git a/bin/cfn-signal b/bin/cfn-signal index 6fd08a5..4685c9b 100755 --- a/bin/cfn-signal +++ b/bin/cfn-signal @@ -21,11 +21,7 @@ import os import sys -if os.path.exists('/opt/aws/bin'): - sys.path.insert(0, '/opt/aws/bin') - from cfn_helper import * -else: - from heat_cfntools.cfntools.cfn_helper import * +from heat_cfntools.cfntools.cfn_helper import * description = " " |