← Back to branch summary

~charmers/charms/precise/glance/trunk

« back to all changes in this revision

Viewing changes to hooks/glance-relations

  • Committer: Adam Gandelman
  • Date: 2012-10-12 17:26:19 UTC
  • mto: (20.3.2 glance)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: adamg@canonical.com-20121012172619-x4bbzr4cd05vlg1d
Rename config option for consistency across charms: glance-release -> openstack-origin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/glance-relations
13
13
  juju-log "Installing glance packages"
14
14
  apt-get -y install python-software-properties || exit 1
15
15
 
16
 
  configure_install_source $(config-get glance-release)
 
16
  configure_install_source $(config-get openstack-origin)
17
17
 
18
18
  apt-get update || exit 1
19
19
  apt-get -y install $PACKAGES || exit 1
172
172
 
173
173
function config_changed() {
174
174
  # Determine whether or not we should do an upgrade, based on whether or not
175
 
  # the version offered in glance-release is greater than what is installed.
 
175
  # the version offered in openstack-origin is greater than what is installed.
176
176
 
177
 
  local install_src=$(config-get glance-release)
 
177
  local install_src=$(config-get openstack-origin)
178
178
  local cur=$(get_os_codename_package "glance-common")
179
179
  local available=$(get_os_codename_install_source "$install_src")
180
180