summaryrefslogtreecommitdiff
path: root/cloud-init.py
diff options
context:
space:
mode:
Diffstat (limited to 'cloud-init.py')
-rwxr-xr-xcloud-init.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cloud-init.py b/cloud-init.py
index 09c537f1..0ba00699 100755
--- a/cloud-init.py
+++ b/cloud-init.py
@@ -140,8 +140,10 @@ def main():
# parse the user data (ec2-run-userdata.py)
try:
- cloud.sem_and_run("consume_userdata", "once-per-instance",
- cloud.consume_userdata,[],False)
+ ran = cloud.sem_and_run("consume_userdata", cloudinit.per_instance,
+ cloud.consume_userdata,[cloudinit.per_instance],False)
+ if not ran:
+ cloud.consume_userdata(cloudinit.per_always)
except:
warn("consuming user data failed!\n")
raise