diff options
| author | Mitch Garnaat <mitch@garnaat.com> | 2012-03-26 05:04:32 -0700 |
|---|---|---|
| committer | Mitch Garnaat <mitch@garnaat.com> | 2012-03-26 05:04:32 -0700 |
| commit | 55beb8e7e660c584af94ff2a70ddeb11615aa8ad (patch) | |
| tree | 4e980e0e23d2c6e5e9fc2fe83f6abc184057f9cc | |
| parent | 6cc1637a26aedf0520e40ec569fe13f8f48263ee (diff) | |
| parent | 3d0ae77d842b2787a3e178804af6deb2d21c5636 (diff) | |
| download | boto-55beb8e7e660c584af94ff2a70ddeb11615aa8ad.tar.gz | |
Merge pull request #660 from jreese/develop
Fall back to plain text launch config user data
| -rw-r--r-- | boto/ec2/autoscale/launchconfig.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/boto/ec2/autoscale/launchconfig.py b/boto/ec2/autoscale/launchconfig.py index 8811fb6b..526f4686 100644 --- a/boto/ec2/autoscale/launchconfig.py +++ b/boto/ec2/autoscale/launchconfig.py @@ -173,7 +173,10 @@ class LaunchConfiguration(object): elif name == 'RamdiskId': self.ramdisk_id = value elif name == 'UserData': - self.user_data = base64.b64decode(value) + try: + self.user_data = base64.b64decode(value) + except TypeError: + self.user_data = value elif name == 'LaunchConfigurationARN': self.launch_configuration_arn = value elif name == 'InstanceMonitoring': |