Rename config option for consistency across charms: glance-release -> openstack-origin.

config.yaml

@@ -1,8 +1,19 @@
 options:
-  glance-release:
+  openstack-origin:
     default: distro
     type: string
-    description: Glance PPA from which to install. (distro, trunk, milestone, milestone-proposed or ppa:somewhere/else)
+    description: |
+      Repository from which to install.  May be one of the following:
+      distro (default), ppa:somecustom/ppa, a deb url sources entry,
+      or a supported Cloud Archive release pocket.
+
+      Supported Cloud Archive sources include: cloud:precise-folsom,
+      cloud:precise-folsom/updates, cloud:precise-folsom/staging,
+      cloud:precise-folsom/proposed.
+
+      Note that updating this setting to a source that is known to
+      provide a later version of OpenStack will trigger a software
+      upgrade.
   db-user:
     default: glance
     type: string

hooks/glance-relations

@@ -13,7 +13,7 @@ function install_hook {
   juju-log "Installing glance packages"
   apt-get -y install python-software-properties || exit 1
 
-  configure_install_source $(config-get glance-release)
+  configure_install_source $(config-get openstack-origin)
 
   apt-get update || exit 1
   apt-get -y install $PACKAGES || exit 1
@@ -172,9 +172,9 @@ function keystone_changed {
 
 function config_changed() {
   # Determine whether or not we should do an upgrade, based on whether or not
-  # the version offered in glance-release is greater than what is installed.
+  # the version offered in openstack-origin is greater than what is installed.
 
-  local install_src=$(config-get glance-release)
+  local install_src=$(config-get openstack-origin)
   local cur=$(get_os_codename_package "glance-common")
   local available=$(get_os_codename_install_source "$install_src")
 

revision

@@ -1 +1 @@
-67
+70