← 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/folsom

  • 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/folsom
15
15
  local quantum_conf=${QUANTUM_CONF:-/etc/quantum/quantum.conf}
16
16
  local quantum_api_conf=${QUANTUM_API_CONF:-/etc/quantum/api-paste.ini}
17
17
  local quantum_plugin_conf=${QUANTUM_PLUGIN_CONF:-/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini}
 
18
  local libvirtd_conf=${LIBVIRTD_CONF:-/etc/libvirt/libvirtd.conf}
18
19
 
19
20
  [[ -z $key ]] && juju-log "$CHARM: set_or_update: value $value missing key" && exit 1
20
21
  [[ -z $value ]] && juju-log "$CHARM: set_or_update: key $key missing value" && exit 1
27
28
                  pattern="$key="
28
29
                  out=$pattern
29
30
                  ;;
30
 
    "$api_conf") match="^$key = "
31
 
                 pattern="$match"
32
 
                 out="$key = "
33
 
                 ;;
34
 
    "$quantum_conf"|"$quantum_api_conf"|"$quantum_plugin_conf")
 
31
    "$api_conf"|"$quantum_conf"|"$quantum_api_conf"|"$quantum_plugin_conf"| \
 
32
    "$libvirtd_conf")
35
33
                 match="^$key = "
36
34
                 pattern="$match"
37
35
                 out="$key = "