~gandelman-a/charms/precise/cinder/upgrade

« back to all changes in this revision

Viewing changes to hooks/cinder-hooks

  • Committer: James Page
  • Date: 2013-02-15 12:05:57 UTC
  • Revision ID: james.page@canonical.com-20130215120557-dsfsbq9w0ehw9j4d
Tweak override for precise cloud-archive

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
install_hook() {
12
12
  install_source="$(config-get openstack-origin)"
13
13
 
14
 
  # Check if we are deploying to Precise.  If so, we need to use
15
 
  # the Cloud Archive instead of the Ubuntu Archive since Cinder
16
 
  # does not exist there (for precise).
 
14
  # Check if we are deploying to Precise from distro.
 
15
  # If so, we need to use the Cloud Archive instead of the
 
16
  # Ubuntu Archive since Cinder does not exist there (for precise).
17
17
  . /etc/lsb-release
18
 
  [[ "$DISTRIB_CODENAME" == "precise" ]] &&
 
18
  [[ "$DISTRIB_CODENAME" == "precise" && "$install_source" == "distro" ]] &&
19
19
    install_source="cloud:precise-folsom"
20
20
 
21
21
  configure_install_source "$install_source"