← Back to branch summary

~openstack-charmers/charms/precise/nova-compute/ha-support

« back to all changes in this revision

Viewing changes to hooks/nova-compute-common

  • Committer: James Page
  • Date: 2013-05-20 11:28:14 UTC
  • mfrom: (41.3.2 nova-compute)
  • mto: This revision was merged to the branch mainline in revision 59.
  • Revision ID: james.page@canonical.com-20130520112814-ll4oyu7fs4mzlvob
Rebase against lp:charms/nova-compute

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova-compute-common
9
9
QUANTUM_CONF="/etc/quantum/quantum.conf"
10
10
LIBVIRTD_CONF="/etc/libvirt/libvirtd.conf"
11
11
HOOKS_DIR="$CHARM_DIR/hooks"
 
12
MULTI_HOST=$(config-get multi-host)
12
13
 
13
14
if [ -f /etc/nova/nm.conf ]; then
14
15
    NET_MANAGER=$(cat /etc/nova/nm.conf)
30
31
    esac
31
32
    ;;
32
33
  "FlatManager"|"FlatDHCPManager")
33
 
    SERVICES="$SERVICES nova-api nova-network"
 
34
    if [[ "$MULTI_HOST" == "yes" ]] ; then
 
35
      SERVICES="$SERVICES nova-api nova-network"
 
36
    fi
34
37
    ;;
35
38
esac
36
39
 
99
102
 
100
103
  case $net_manager in
101
104
    "FlatManager"|"FlatDHCPManager")
102
 
      apt-get -y install nova-api nova-network
103
 
      SERVICES="$SERVICES nova-api nova-network"
 
105
      if [[ "$MULTI_HOST" == "yes" ]] ; then
 
106
        apt-get -y install nova-api nova-network
 
107
        SERVICES="$SERVICES nova-api nova-network"
 
108
      fi
104
109
      [[ -n $net_manager ]] && echo $net_manager > /etc/nova/nm.conf
105
110
      ;;&
106
111
    "FlatManager")