Merge lp:~jorge/pyjuju/default-to-packages into lp:~charm-contributors/pyjuju/docs

[Jorge Castro]

Please don't merge yet while discussion happens on the juju list.

[Juan L. Negron (negronjl)]

Looks good to me.

-Juan

review: Approve

[Juan L. Negron (negronjl)]

We should get more people's comments/reviews here before merging.

-Juan

[Clint Byrum (clint-fewbar)]

I would change:

If the service is seeded

to

If the principal software needed to provide the service is available in a seeded package

Also it would be useful if you did the other 3 changes in a separate branch which this merge proposal can depend on. Its somewhat distracting seeing all of the changes at once here.

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

<poke> Whats the status on this?

Unmerged revisions

74. By Jorge Castro on 2012-09-27

* Revised policy to "must" default to packages if the service is in main.

73. By Jorge Castro on 2012-09-27

Fix up some footnotes

72. By Jorge Castro on 2012-09-27

* Be explicit about defaulting charms to packaged versions if in main?

71. By Jorge Castro on 2012-09-27

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

=== modified file 'source/policy.rst'
--- source/policy.rst	2012-08-15 18:22:32 +0000
+++ source/policy.rst	2012-09-27 19:53:22 +0000
@@ -1,5 +1,5 @@
-:Version: 0.1.1
-:Authors: Clint Byrum <[e-mail]>
+:Version: 0.1.2
+:Authors: Clint Byrum <[e-mail]>, Jorge Castro <[e-mail]>
 :Date: August 15, 2012
 
 ==================
@@ -34,15 +34,16 @@
   team or individual who are responsive to contact regarding the charm.
 * must include a license. Call the file 'copyright' and make sure all
   files' licenses are specified clearly. license_
-* must be under a Free license. license2_ 
-* must have hooks that are idempotent idempotent_
+* must be under a Free license2_ 
+* must have hooks that are idempotent_
 * must not run any network services using default passwords.
-* should default to use software that is included in the Ubuntu archive,
+* If the service is seeded_ in the Ubuntu archive, it must default to that package,
   however we encourage that charm authors have a config options for
-  allowing users to deploy from newer upstream releases, or even right
+  allowing users to deploy from newer upstream releases, PPAs, or even right
   from VCS if it's useful to users.
 * should not use anything infrastructure-provider specific (i.e. querying
-  EC2 metadata service) symlinks must be self contained within a charm.
+  EC2 metadata service) 
+* symlinks must be self contained within a charm.
 * should make use of `AppArmor <https://juju.ubuntu.com/AppArmor>`_ to increase security
 
 Terminology
@@ -191,3 +192,6 @@
 
 .. [#reliable] Whether or not an external service is "reliable" is up to
                the charm maintainer(s) to determine.
+
+.. [#seeded] Formally known as Ubuntu "main".
+              

=== 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 19:53:22 +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.