← Back to branch summary

~gandelman-a/charms/precise/nova-cloud-controller/epoch_fix

« back to all changes in this revision

Viewing changes to hooks/lib/nova/essex

  • Committer: Adam Gandelman
  • Date: 2013-01-17 21:27:14 UTC
  • mfrom: (48.1.12 nova-cloud-controller)
  • mto: This revision was merged to the branch mainline in revision 53.
  • Revision ID: adamg@canonical.com-20130117212714-1jplsq18uke2ukjz
Merge all pending live-migration work into current ha branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/lib/nova/essex
12
12
 
13
13
  local nova_conf=${NOVA_CONF:-/etc/nova/nova.conf}
14
14
  local api_conf=${API_CONF:-/etc/nova/api-paste.ini}
15
 
 
 
15
  local libvirtd_conf=${LIBVIRTD_CONF:-/etc/libvirt/libvirtd.conf}
16
16
  [[ -z $key ]] && juju-log "$CHARM set_or_update: value $value missing key" && exit 1
17
17
  [[ -z $value ]] && juju-log "$CHARM set_or_update: key $key missing value" && exit 1
18
18
  [[ -z "$conf_file" ]] && conf_file=$nova_conf
22
22
                  pattern="--$key="
23
23
                  out=$pattern
24
24
                  ;;
25
 
    "$api_conf") match="^$key = "
 
25
    "$api_conf"|"$libvirtd_conf") match="^$key = "
26
26
                 pattern="$match"
27
27
                 out="$key = "
28
28
                 ;;