diff options
| author | Scott Moser <smoser@ubuntu.com> | 2010-01-20 16:26:21 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2010-01-20 16:26:21 -0500 |
| commit | 272bdb4ad359f2f7b8a809ec16b1e5df90695a66 (patch) | |
| tree | 6df58ebbbce9b6642a9a9168491bfea36bc08c1f /ec2-init.py | |
| parent | 89bff8f826040f7c9d1cc85880eaf016e72d2191 (diff) | |
| download | vyos-cloud-init-272bdb4ad359f2f7b8a809ec16b1e5df90695a66.tar.gz vyos-cloud-init-272bdb4ad359f2f7b8a809ec16b1e5df90695a66.zip | |
lots of shuffling around. more fully support old ec2-init.cfg and, add
new preferred config file /etc/cloud/cloud.cfg.
cloud.cfg is read, its values are overridden by the cloud-config data
from user data
Diffstat (limited to 'ec2-init.py')
| -rwxr-xr-x | ec2-init.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ec2-init.py b/ec2-init.py index b483fd5d..4b4bd494 100755 --- a/ec2-init.py +++ b/ec2-init.py @@ -12,7 +12,6 @@ def warn(str): def main(): cloud = ec2init.EC2Init() - data = None try: cloud.get_data_source() except Exception as e: @@ -42,13 +41,6 @@ def main(): except: warn("failed to set defaults\n") - # set the ssh keys up - try: - cloud.sem_and_run("apply_credentials", "once-per-instance", - cloud.apply_credentials,[],False) - except: - warn("applying credentials failed!\n") - # enable swap try: cloud.sem_and_run("enable_swap", "once-per-instance", |