Merge lp:~mhall119/awstrial/remove-byobu-enable-850957 into lp:awstrial

[Michael Hall]

Convert byobu-enable script to just installing the countdown widget, include it all the time

Convert byobu-enable script to just installing the countdown widget, include it all the time

[Matthew Nuzum (newz)]

Looks good

review: Approve

=== renamed file 'awstrial/templates/cloud-init/byobu-enable' => 'awstrial/templates/cloud-init/byobu-countdown'
--- awstrial/templates/cloud-init/byobu-enable	2010-09-30 12:58:03 +0000
+++ awstrial/templates/cloud-init/byobu-countdown	2011-10-20 14:14:30 +0000
@@ -1,14 +1,9 @@
 #!/bin/sh
-#sudo -Hu ubuntu byobu-launcher-install # single user
-sem="/var/lib/cloud/sem/byobu-enable.${INSTANCE_ID}"
+
+sem="/var/lib/cloud/sem/byobu-countdown.${INSTANCE_ID}"
 [ -e "${sem}" ] && exit 0
 
-debconf-set-selections <<EOF
-byobu byobu/launch-by-default boolean true
-EOF
-dpkg-reconfigure byobu --frontend=noninteractive
-
-# above does it for all users, but below is only for 'ubuntu' user
+# Add AWSTrial countdown widget only for 'ubuntu' user
 sudo -Hu ubuntu sh -c 'mkdir -p ~/.byobu/bin/ &&
    cat > ~/.byobu/bin/1_countdown && chmod +x ~/.byobu/bin/1_countdown' <<"EOF"
 #!/bin/sh

=== modified file 'awstrial/trial/ec2_helper.py'
--- awstrial/trial/ec2_helper.py	2011-10-19 19:41:55 +0000
+++ awstrial/trial/ec2_helper.py	2011-10-20 14:14:30 +0000
@@ -63,8 +63,7 @@
 
     return connection
 
-def runit(campaign,lpid=None,regions=None,config=None, byobu=False,
-          password=None):
+def runit(campaign,lpid=None,regions=None,config=None, password=None):
     sec_key = util.rand_str(32)
     if regions is None:
         regions = [r for r in settings.REGIONS_TRY_ORDER
@@ -73,7 +72,6 @@
                          if settings.REGION2AMI.has_key(r)]
 
     cust = { }
-    cust['byobu'] = False
     cust['config'] = config
     cust['password'] = password
 
@@ -115,12 +113,11 @@
                 { 'debug' : settings.DEBUG, 'user': 'ubuntu', 'password' : password }),
             part_type=util.CI_SCRIPT, filename="55-password-enable"))
 
-    if str(byobu).lower() == "true":
-        parts.append(
-            util.partItem(
-                render_to_string("byobu-enable", { 'debug' : settings.DEBUG, }),
-                part_type=util.CI_BOOTHOOK, filename="byobu-enable"))
-        cust['byobu']=True
+    parts.append(
+        util.partItem(
+            render_to_string("byobu-countdown", { 'debug' : settings.DEBUG, }),
+            part_type=util.CI_BOOTHOOK, filename="byobu-countdown"))
+    cust['byobu']=True
 
     instcfg = None
     for c in settings.CONFIGS:

=== modified file 'awstrial/trial/views.py'
--- awstrial/trial/views.py	2011-10-18 20:11:39 +0000
+++ awstrial/trial/views.py	2011-10-20 14:14:30 +0000
@@ -86,14 +86,13 @@
                     else:
                         regions = settings.REGIONS_TRY_ORDER
                     config = request.POST.get('config', '')
-                    byobu = request.POST.get('byobu','')
                     set_password = request.POST.get('set_password',None)
 
                     password=None
                     if set_password:
                         password=util.rand_user_password()
 
-                    ec2_helper.runit(campaign,lpid=request.user, regions=regions, config=config, byobu=byobu, password=password)
+                    ec2_helper.runit(campaign,lpid=request.user, regions=regions, config=config, password=password)
                     #send_mail(subject, message, from_email, ['[e-mail]'])
                     #except BadHeaderError:   #Example of basic error handling
                     #	return HttpResponse('Invalid header found.')