Merge lp:~mhall119/awstrial/fix-873023 into lp:awstrial

[Michael Hall]

Change wording on password auth use, since we no longer require that they change their password

Changes the text warning that the user sees when their account doesn't have a launchpad profile, or does not have ssh keys in launchpad, telling them that they will need to change their password at their first login.

[lp:~mhall119/awstrial/fix-873023]

264. By Michael Hall on 2011-10-20

Remove message, stating that a password change will be required, from the /instance_info/ page

[Matthew Nuzum (newz)]

review: Approve

=== modified file 'awstrial/templates/contacts.html'
--- awstrial/templates/contacts.html	2011-10-04 15:26:38 +0000
+++ awstrial/templates/contacts.html	2011-10-20 14:17:55 +0000
@@ -14,7 +14,7 @@
         <p>We will give you the hostname and you can SSH directly to the instance with your public SSH key on file in <a href=http://launchpad.net>Launchpad</a>.  You will have full <a href=https://help.ubuntu.com/community/RootSudo>sudo (root) access</a>, so take it for an hour-long joyride, install applications, configure services, test your programs, and evaluate the overall experience.  We will terminate and clean up the instance automatically within an hour.</p>
 
         {% if set_password %}
-        <p><em>You do not have ssh keys on file in your launchpad account.  We strongly recommend you follow the documentation mentioned above and add keys to your launchpad account.  Ssh key authentication is much more secure than password authentication.  However, if you would like to launch an instance without using ssh keys, you may do so.  Click 'Launch' below, and you will be generated a one-time use password and forced to change it on first login</em></p>
+        <p><em>You do not have ssh keys on file in your launchpad account.  We strongly recommend you follow the documentation mentioned above and add keys to your launchpad account.  Ssh key authentication is much more secure than password authentication.  However, if you would like to launch an instance without using ssh keys, you may do so.  Click 'Launch' below, and you will be generated a random password which you can then change after login</em></p>
         {% endif %}
         <div id="contact" class="clearfix">
             <div id="c_form">

=== modified file 'awstrial/templates/instance.html'
--- awstrial/templates/instance.html	2011-10-18 13:58:40 +0000
+++ awstrial/templates/instance.html	2011-10-20 14:17:55 +0000
@@ -82,7 +82,7 @@
       {% endif %}
     {% else %}
     {% if instance.password %}
-  <p>Your randomly generated one time password is '<b>{{ instance.password }}</b>'.  You will be forced to change that on initial login.</p>
+  <p>Your randomly generated one time password is '<b>{{ instance.password }}</b>'.</p>
     {% endif %}
   <p>You can <a href=https://help.ubuntu.com/community/SSH/OpenSSH/ConnectingTo target="_blank" >SSH</a> to your Cloud Server using:</p>
 <pre>    ssh ubuntu@{{instance.ip}}</pre>