Merge lp:~jorge/pyjuju/remove-default-instance-type into lp:~charm-contributors/pyjuju/docs

[Jorge Castro]

[Martin Packman (gz)]

I'm not sure this is what Kapil was suggesting. I'd prefer to keep this documentation, it reflects what's in the code but points people towards constraints. Instead I think the kinds of things we want to update a tutorials and such like that give example environments.yaml files, such as:

<http://askubuntu.com/questions/116174/how-can-i-configure-juju-for-deployment-on-hp-cloud>

There was another one in the general juju docs too I think?

review: Needs Information

Unmerged revisions

71. By Jorge Castro on 2012-09-27

Remove mention of default-instance-type, this should be managed via constraints.

=== modified file 'source/provider-configuration-openstack.rst'
--- source/provider-configuration-openstack.rst	2012-08-28 15:16:35 +0000
+++ source/provider-configuration-openstack.rst	2012-09-27 14:15:29 +0000
@@ -31,10 +31,6 @@
         creating instances. As there is currently no standard image service
         across different OpenStack deployments, this must always be supplied.
 
-    default-instance-type:
-        Flavor name as given by ``nova flavor-list`` for juju to use when
-        creating instances. Setting constraints will serve the same purpose.
-
     default-series:
         Declares the Ubuntu series of the machine image. For instance, this
         should be `precise` for an Ubuntu 12.04 image.