From 7b5647b52dfb41abe1ed038b2f7e8b7248096f85 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Fri, 12 Oct 2012 10:29:56 -0700
Subject: [PATCH] Rename config option for consistency across charms:
 nova-release -> openstack-origin.

---
 config.yaml                  | 15 +++++++++++++--
 hooks/nova-compute-relations |  6 +++---
 revision                     |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/config.yaml b/config.yaml
index 73f5c6f..81e073a 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,8 +1,19 @@
 options:
-  nova-release:
+  openstack-origin:
     default: distro
     type: string
-    description: Nova PPA from which to install. (distro, trunk, milestone, milestone-proposed)
+    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.
   nova-config:
     default: /etc/nova/nova.conf
     type: string
diff --git a/hooks/nova-compute-relations b/hooks/nova-compute-relations
index b3f83d6..f28fbbd 100755
--- a/hooks/nova-compute-relations
+++ b/hooks/nova-compute-relations
@@ -12,7 +12,7 @@ function install_hook {
   local virt_type=$(config-get virt-type)
   local compute_pkg=$(determine_compute_package "$virt_type")
   apt-get -y install python-software-properties || exit 1
-  configure_install_source $(config-get nova-release)
+  configure_install_source $(config-get openstack-origin)
   apt-get update || exit 1
   apt-get -y install $compute_pkg $PACKAGES || exit 1
   service_ctl all stop
@@ -21,9 +21,9 @@ function install_hook {
 function config_changed() {
 
   # Determine whether or not we should do an upgrade, based on whether or not
-  # the version offered in nova-release is greater than what is installed.
+  # the version offered in openstack-origin is greater than what is installed.
 
-  local install_src=$(config-get nova-release)
+  local install_src=$(config-get openstack-origin)
   local cur=$(get_os_codename_package "nova-common")
   local available=$(get_os_codename_install_source "$install_src")
 
diff --git a/revision b/revision
index 1479e19..69a893a 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-65
+66