Merge lp:~whitmo/charms/trusty/cloudfoundry/1.24-fixes into lp:~cf-charmers/charms/trusty/cloudfoundry/trunk

[Whit Morriss]

[Whit Morriss (whitmo)]

Minor fixes to get cf running with juju 1.24 & some more aggressive linewrapping for the Readme.

[Benjamin Saller (bcsaller)]

LGTM, might want to add a comment that this now needs 1.24+ to deploy (after that status format change).

review: Approve

Unmerged revisions

170. By Whit Morriss on 2015-07-13

format readme, update jujuclient and raindance deps, 1.24 compat for utils.py

=== modified file 'README.rst'
--- README.rst	2014-11-12 03:55:51 +0000
+++ README.rst	2015-07-13 14:46:01 +0000
@@ -14,23 +14,25 @@
 
 A juju charm to deploy and manage a Cloud Foundry deployment.
 
-If you are unfamiliar with CloudFoundry we suggest referring to their documentation.
+If you are unfamiliar with CloudFoundry we suggest referring to their
+documentation.
 
         http://docs.cloudfoundry.org/
 
 Documenting CF is beyond the scope of this project. However, once deployed, using the
 system is a normal CF experience as described in the above docs.
 
-We provide a set of helper scripts (in bash) which can be used to assist in the deployment and
-management of CF.
+We provide a set of helper scripts (in bash) which can be used to
+assist in the deployment and management of CF.
 
 
 Deployment
 ----------
 
-It is recommended that you obtain a local copy of the charm, as it will give you access
-to helper scripts which can auto-configure the system. This is largely because of the way
-an orchestrator charm needs admin access to the running deployment.
+It is recommended that you obtain a local copy of the charm, as it
+will give you access to helper scripts which can auto-configure the
+system. This is largely because of the way an orchestrator charm needs
+admin access to the running deployment.
 
 To obtain the charm:
 
@@ -41,19 +43,20 @@
 
     ./cfdeploy <cf_admin_password>
 
-This will gather the necessary Juju admin credentials and boot up the bundle
-orchestrator which will setup and manage a CF deployment using Juju. The command
-will block until the deployment is fully up and running. It also will create a
-CF "admin" user with the given password, leaving you logged in and ready to push
-a CF app. Note that while this can take quite some time, the whole process is
-automated. 
-
-If you don't have the cf command line client the latest one will be installed
-from a .deb package to your local system as part of cfdeploy.
-
-Once the deploy completes, you can push apps. A sample application we recommend
-to become familiar with the system is GitHub High Score website. This can be
-pushed with the following:
+This will gather the necessary Juju admin credentials and boot up the
+bundle orchestrator which will setup and manage a CF deployment using
+Juju. The command will block until the deployment is fully up and
+running. It also will create a CF "admin" user with the given
+password, leaving you logged in and ready to push a CF app. Note that
+while this can take quite some time, the whole process is automated.
+
+If you don't have the cf command line client the latest one will be
+installed from a .deb package to your local system as part of
+cfdeploy.
+
+Once the deploy completes, you can push apps. A sample application we
+recommend to become familiar with the system is GitHub High Score
+website. This can be pushed with the following:
 
     git clone https://github.com/bcsaller/github-high-scores
     cd github-high-scores
@@ -75,10 +78,10 @@
 
 You can then use the CF admin user credentials to log in.
 
-Note that, currently, once the Admin UI is deployed, you must manually remove
-it if you change the value of the `admin_ui` option, but that changing the
-option is required to prevent the Admin UI from potentially being re-deployed
-after being manually removed.
+Note that, currently, once the Admin UI is deployed, you must manually
+remove it if you change the value of the `admin_ui` option, but that
+changing the option is required to prevent the Admin UI from
+potentially being re-deployed after being manually removed.
 
 
 Development

=== modified file 'cloudfoundry/utils.py'
--- cloudfoundry/utils.py	2015-01-16 22:06:05 +0000
+++ cloudfoundry/utils.py	2015-07-13 14:46:01 +0000
@@ -390,7 +390,7 @@
         return False
     sdata = status['Services']['cloudfoundry']
     for unit in sdata['Units'].values():
-        if unit['Agent']['Status'] not in ['installed', 'started']:
+        if unit['AgentState'] not in ['installed', 'started']:
             return False
     return True
 

=== removed file 'wheelhouse/jujuclient-0.18.4-py2-none-any.whl'
Binary files wheelhouse/jujuclient-0.18.4-py2-none-any.whl	2014-10-07 16:01:59 +0000 and wheelhouse/jujuclient-0.18.4-py2-none-any.whl	1970-01-01 00:00:00 +0000 differ
=== added file 'wheelhouse/jujuclient-0.50.1-py2-none-any.whl'
Binary files wheelhouse/jujuclient-0.50.1-py2-none-any.whl	1970-01-01 00:00:00 +0000 and wheelhouse/jujuclient-0.50.1-py2-none-any.whl	2015-07-13 14:46:01 +0000 differ
=== removed file 'wheelhouse/raindance-0.3dev_r0-py2-none-any.whl'
Binary files wheelhouse/raindance-0.3dev_r0-py2-none-any.whl	2014-11-06 18:44:09 +0000 and wheelhouse/raindance-0.3dev_r0-py2-none-any.whl	1970-01-01 00:00:00 +0000 differ
=== added file 'wheelhouse/raindance-0.5-py2-none-any.whl'
Binary files wheelhouse/raindance-0.5-py2-none-any.whl	1970-01-01 00:00:00 +0000 and wheelhouse/raindance-0.5-py2-none-any.whl	2015-07-13 14:46:01 +0000 differ