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

config.yaml

@@ -1,13 +1,20 @@
 options:
-    horizon-release:
-        default: "distro"
+   openstack-origin:
+        default: distro
         type: string
         description: |
-          Installation source. Default installs packages from Ubuntu archive.
-          Valid choices are a LP PPA ('ppa:your/ppa') or a URL entry for
-          sources.list with an optional GPG key appended after | for import
-          from Ubuntu keyserver ('http://host/ubuntu oneiric main|KEYID')
-    webroot:
+          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.
+   webroot:
         default: "/horizon"
         type: string
         description: |

hooks/horizon-relations

@@ -11,7 +11,7 @@ else
 fi
 
 function install_hook {
-  configure_install_source $(config-get horizon-release)
+  configure_install_source $(config-get openstack-origin)
   apt-get update
   juju-log "$CHARM: Installing $PACKAGES."
   DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
@@ -47,7 +47,7 @@ function keystone_changed {
 }
 
 function config_changed {
-  local install_src=$(config-get horizon-release)
+  local install_src=$(config-get openstack-origin)
   local cur=$(get_os_codename_package "openstack-dashboard")
   local available=$(get_os_codename_install_source "$install_src")
 

revision

@@ -1 +1 @@
-16
+17