← Back to branch summary

~hopem/charms/precise/nova-cloud-controller/lp1273067

« back to all changes in this revision

Viewing changes to hooks/lib/nova/nova-common

  • Committer: Adam Gandelman
  • Date: 2012-12-07 00:21:54 UTC
  • mfrom: (46.3.13 nova-cloud-controller)
  • Revision ID: adamg@canonical.com-20121207002154-n5p31om88d767x4i
Merge Quantum networking support from James Page.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/lib/nova/nova-common
50
50
    "FlatDHCPManager")
51
51
      set_or_update "network_manager" "nova.network.manager.FlatDHCPManager"
52
52
      ;;
53
 
    *) echo "ERROR: Invalid network manager $1" && exit 1 ;;
 
53
    "Quantum")
 
54
      local local_ip=$(get_ip `unit-get private-address`)
 
55
      [[ -n $local_ip ]] || {
 
56
        juju-log "Unable to resolve local IP address"
 
57
        exit 1
 
58
      }
 
59
      set_or_update "network_api_class" "nova.network.quantumv2.api.API"
 
60
      set_or_update "quantum_auth_strategy" "keystone"
 
61
      set_or_update "core_plugin" "$QUANTUM_CORE_PLUGIN" "$QUANTUM_CONF"
 
62
      set_or_update "bind_host" "0.0.0.0" "$QUANTUM_CONF"
 
63
      if [ "$QUANTUM_PLUGIN" == "ovs" ]; then
 
64
          set_or_update "tenant_network_type" "gre" $QUANTUM_PLUGIN_CONF "OVS"
 
65
          set_or_update "enable_tunneling" "True" $QUANTUM_PLUGIN_CONF "OVS"
 
66
          set_or_update "tunnel_id_ranges" "1:1000" $QUANTUM_PLUGIN_CONF "OVS"
 
67
          set_or_update "local_ip" "$local_ip" $QUANTUM_PLUGIN_CONF "OVS"
 
68
      fi
 
69
      ;;
 
70
    *) juju-log "ERROR: Invalid network manager $1" && exit 1 ;;
54
71
  esac
55
72
}
56
73