Merge lp:~aglenyoung/charms/precise/nova-cloud-controller/configurable-multi_host into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[Andrew Glen-Young]

Add options for multi_host which requires the cloud-controller to run nova-network.
Create nova networks automatically if FlatManager or FlatDHCPManager is used.
Add config options to support nrpe-external-master subordinate.

[Adam Gandelman (gandelman-a)]

Hey Andrew-

Some comments:

- I'd prefer if nova-network were not configured by default, and instead enabled by a config option (similar to conf-ext-net for quantum)

- It would be cool if we could not have nova-api-metadata in list of SERVICES by default, and only have it added when non-multi_host nova-network is configured. Also, if nova-network were added to SERVICES as well, you could avoid the special case in lib/openstack-common.service_ctl().

- I'd prefer if the bits that do the network configuration move to their own function somewhere in hooks/nova-cloud-controller-common. This will make it easier to merge with some big changes were working on elsewhere [1]. Similar to configure_quantum_netowrking().

[1] https://code.launchpad.net/~openstack-charmers/charms/precise/nova-cloud-controller/ha-support

review: Needs Fixing

Unmerged revisions

49. By Andrew Glen-Young on 2013-02-28

Make multi_host configurable, automatically create floating and fixed ip ranges.
Add support for nrpe-external-master subordinate charm.

=== modified file 'config.yaml'
--- config.yaml	2012-12-03 15:06:35 +0000
+++ config.yaml	2013-02-28 21:47:21 +0000
@@ -104,3 +104,37 @@
     default: None
     type: string
     description: Comma separated list of key=value config flags to be set in nova.conf.
+  nova-network-name:
+    default: nova
+    type: string
+    description: Name of the nova-network network
+  nova-fixed-range:
+    default: 172.16.0.0/24
+    type: string
+    description: Fixed IPv4 address range in CIDR format
+  nova-floating-range:
+    default: 172.16.1.0/24
+    type: string
+    description: Floating IPv4 address range in CIDR format
+  nova-public-interface:
+    default: eth0
+    type: string
+    description: Name of the network interface for public/floating IP addresses
+  nova-flat-interface:
+    default: eth0
+    type: string
+    description: Name of the network interface for flat/fixed IP addresses
+  nova-multi-host:
+    default: "yes"
+    type: string
+    description: Whether to use Vishy-HA.
+  nagios_context:
+    default: "juju"
+    type: string
+    description: |
+      Used by the nrpe-external-master subordinate charm.
+      A string that will be prepended to instance name to set the host name
+      in nagios. So for instance the hostname would be something like:
+          juju-myservice-0
+      If you're running multiple environments with the same services in them
+      this allows you to differentiate between them.

=== modified file 'hooks/lib/nova/nova-common'
--- hooks/lib/nova/nova-common	2012-12-06 21:32:44 +0000
+++ hooks/lib/nova/nova-common	2013-02-28 21:47:21 +0000
@@ -42,13 +42,29 @@
 
 function configure_network_manager {
   local manager="$1"
+  local bridge_interface=$(config-get bridge-interface)
+  local multi_host=$(config-get nova-multi-host)
   echo "$CHARM: configuring $manager network manager"
   case $1 in
     "FlatManager")
       set_or_update "network_manager" "nova.network.manager.FlatManager"
+      if [[ -n "$bridge_interface" && "$multi_host" == "no" ]] ; then
+        set_or_update "flat_network_bridge" "$bridge_interface"
+        DEBIAN_FRONTEND=noninteractive apt-get -y install nova-network
+      fi
+      if [[ "$multi_host" == "yes" ]] ; then
+        set_or_update "multi_host" "True"
+      fi
       ;;
     "FlatDHCPManager")
       set_or_update "network_manager" "nova.network.manager.FlatDHCPManager"
+      if [[ -n "$bridge_interface" && "$multi_host" == "no" ]] ; then
+        set_or_update "flat_network_bridge" "$bridge_interface"
+        DEBIAN_FRONTEND=noninteractive apt-get -y install nova-network
+      fi
+      if [[ "$multi_host" == "yes" ]] ; then
+        set_or_update "multi_host" "True"
+      fi
       ;;
     "Quantum")
       local local_ip=$(get_ip `unit-get private-address`)
@@ -118,3 +134,8 @@
   nova_post_upgrade "$orig_os_rel"
 
 }
+
+function get_network_size() {
+  local network=$1
+  python -c "import ipaddr; print int(ipaddr.IPv4Network('$network').numhosts)"
+}

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2012-12-06 10:20:34 +0000
+++ hooks/lib/openstack-common	2013-02-28 21:47:21 +0000
@@ -21,6 +21,9 @@
 function service_ctl {
   # control a specific service, or all (as defined by $SERVICES)
   if [[ $1 == "all" ]] ; then
+    if dpkg -l | grep --quiet '^[hi]i\s*nova-network'; then
+      SERVICES="$SERVICES nova-network"
+    fi
     ctl="$SERVICES"
   else
     ctl="$1"

=== modified file 'hooks/nova-cloud-controller-common'
--- hooks/nova-cloud-controller-common	2012-12-03 11:17:36 +0000
+++ hooks/nova-cloud-controller-common	2013-02-28 21:47:21 +0000
@@ -3,7 +3,7 @@
 CHARM="nova-cloud-controller"
 CONF_DIR="/etc/nova"
 
-SERVICES="nova-api-ec2 nova-api-os-compute nova-objectstore nova-cert nova-scheduler"
+SERVICES="nova-api-ec2 nova-api-os-compute nova-objectstore nova-cert nova-scheduler nova-api-metadata"
 
 # If we have a relation to nova-volume-service, we'll also manage its API
 # endpoint here.
@@ -13,7 +13,7 @@
   dpkg -l | grep -q nova-api-os-volume || apt-get -y install nova-api-os-volume
 fi
 
-PACKAGES="$SERVICES python-mysqldb python-keystone uuid"
+PACKAGES="$SERVICES python-mysqldb python-keystone uuid python-ipaddr"
 
 NET_MANAGER=$(config-get network-manager)
 if [ "$NET_MANAGER" == "Quantum" ]; then

=== modified file 'hooks/nova-cloud-controller-relations'
--- hooks/nova-cloud-controller-relations	2012-12-05 11:44:02 +0000
+++ hooks/nova-cloud-controller-relations	2013-02-28 21:47:21 +0000
@@ -10,6 +10,8 @@
 fi
 
 function install_hook {
+  [[ -d exec.d ]] && ( for f in exec.d/*/charm-pre-install; do [[ -x $f ]] && $SHELL -c "$f";done )
+
   juju-log "$CHARM: Installing nova packages"
   apt-get -y install python-software-properties || exit 1
   configure_install_source "$(config-get openstack-origin)"
@@ -149,6 +151,57 @@
   fi
   service_ctl all stop
   /usr/bin/nova-manage db sync
+
+  local multi_host=$(config-get nova-multi-host)
+
+  # Quantum has it's own DB and networking config.
+  if [[ "$NET_MANAGER" != "Quantum" ]] ; then
+    # We set up nova-networking here after the intial database has been
+    # initialized.
+    # TODO:
+    # - IPv6 support.
+    # - Support more than one network.
+    local network_name=$(config-get nova-network-name)
+    local fixed_range=$(config-get nova-fixed-range)
+    local floating_range=$(config-get nova-floating-range)
+    local bridge_interface=$(config-get bridge-interface)
+    local flat_interface=$(config-get nova-flat-interface)
+    local public_interface=$(config-get nova-public-interface)
+    local floating_interface="--interface=$public_interface"
+    local network_size=$(get_network_size $fixed_range)
+
+    set_or_update fixed_range $fixed_range
+    set_or_update floating_range $floating_range
+    set_or_update flat_interface $flat_interface
+    set_or_update public_interface $public_interface
+
+    # The nova-manage network and floating commands are not idempotent.
+    if [[ ! -e /var/lib/nova/juju-fixed-network ]] ; then
+      nova-manage network create --label=$network_name \
+        --fixed_range_v4=$fixed_range --num_networks=1 \
+        --bridge=$bridge_interface --network_size=$network_size
+      echo $fixed_range > /var/lib/nova/juju-fixed-network
+    fi
+
+    if [[ ! -e /var/lib/nova/juju-floating-network ]] ; then
+      nova-manage floating create --ip_range=$floating_range \
+        --pool=$network_name $floating_interface
+      echo $floating_range > /var/lib/nova/juju-floating-network
+    fi
+
+    # If the IP address interfaces are different, we need to enable forwarding
+    # between them.
+    if [[ -n "$public_interface" ]] && [[ -n "$flat_interface" ]] && \
+       [[ "$public_interface" != "$flat_interface" ]] ; then
+        if [[ -d /etc/sysctl.d ]] ; then
+            echo 'net.ipv4.ip_forward = 1' > /etc/sysctl.d/60-ip_forward.conf
+        else
+            echo 'net.ipv4.ip_forward = 1' >> /etc/sysctl.conf
+        fi
+        /sbin/sysctl -w net.ipv4.ip_forward=1
+    fi
+  fi
+
   service_ctl all start
   if [ "$NET_MANAGER" == "Quantum" ]; then
     configure_quantum_networking

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-12-03 15:41:33 +0000
+++ metadata.yaml	2013-02-28 21:47:21 +0000
@@ -24,3 +24,6 @@
     interface: nova-volume
   quantum-network-service:
     interface: quantum
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container