Merge lp:~gandelman-a/charms/precise/nova-cloud-controller/trunk into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[Adam Gandelman]

[lp:~gandelman-a/charms/precise/nova-cloud-controller/trunk]

22. By Adam Gandelman on 2012-01-09

Merge lp:~gandelman-a/charm/precise/nova-cloud-controller/trunk

=== modified file 'config.yaml'
--- config.yaml	2011-10-26 22:22:12 +0000
+++ config.yaml	2012-01-05 01:21:26 +0000
@@ -2,7 +2,7 @@
   nova-release:
     default: distro
     type: string
-    description: Nova PPA from which to install. (distro, trunk, milestone, milestone-proposed)
+    description: Nova PPA from which to install. (distro, trunk, milestone, milestone-proposed or ppa:somewhere/else)
   nova-config:
     default: /etc/nova/nova.conf
     type: string

=== added symlink 'hooks/identity-service-relation-changed'
=== target is u'nova-cloud-controller-relations'
=== added symlink 'hooks/identity-service-relation-joined'
=== target is u'nova-cloud-controller-relations'
=== modified file 'hooks/nova-cloud-controller-common'
--- hooks/nova-cloud-controller-common	2011-11-15 01:00:20 +0000
+++ hooks/nova-cloud-controller-common	2012-01-05 01:21:26 +0000
@@ -1,8 +1,9 @@
 #!/bin/bash
 SERVICES="nova-api nova-objectstore nova-scheduler"
-PACKAGES="$SERVICES python-mysqldb"
+PACKAGES="$SERVICES python-mysqldb python-keystone openstackx"
 
 NOVA_CONF=$(config-get nova-config)
+API_CONF="/etc/nova/api-paste.ini"
 
 # we'll request credentials via the amqp relation for this user
 RABBIT_USER=$(config-get rabbit-user)
@@ -30,6 +31,19 @@
   fi
 }
 
+function update_pipeline {
+  # updates pipeline middleware definitions in api-paste.ini
+  local pipeline="$1"
+  local new="$2"
+  local tag="\[pipeline:$pipeline\]"
+  if ! grep -q "$tag" $API_CONF ; then
+      echo "ERROR: pipeline not found: $pipeline"
+      return 1
+  fi
+  juju-log "Updating pipeline:$pipeline in $API_CONF"
+  sed -i "/$tag/, +1 s/\(pipeline = \).*/\1$new/g" $API_CONF
+}
+
 function nova_ctl_status {
   SERVICE=$1
   # workaround upstarts lack of scriptable return codes
@@ -114,11 +128,24 @@
 }
 
 function add_ppa {
-  # don't setup PPA, install from archive
+  # Install from archive instead of PPA.
   [[ $PPA == "distro" ]] && return 0
-  juju-log "nova-cloud-controller: Configuring PPA access for $PPA"
   . /etc/lsb-release
-  PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
-  add-apt-repository "$PPA_URL" || exit 1
+  [[ -z $PPA ]] && return 0
+  # if referenced by name, setup ppa to upstream PPAs
+  if [[ "$PPA" == "trunk" ]] ||
+     [[ "$PPA" == "milestone" ]] ||
+     [[ "$PPA" == "milestone-proposed" ]] ; then
+      juju-log "nova: Configuring installation from upstream PPA ($PPA)"
+      PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
+      add-apt-repository "$PPA_URL" || exit 1
+      return
+  fi
+  if [[ "${PPA:0:4}" == "ppa:" ]] ; then
+    juju-log "nova: Configuring installation from custom PPA ($PPA)"
+    add-apt-repository -y "$PPA" || exit 1
+    return
+  fi
+  juju-log "nova: No PPA specified. Falling back to installation from Ubuntu archive."
 }
 

=== modified file 'hooks/nova-cloud-controller-relations'
--- hooks/nova-cloud-controller-relations	2011-11-15 01:00:20 +0000
+++ hooks/nova-cloud-controller-relations	2012-01-05 01:21:26 +0000
@@ -17,6 +17,17 @@
   DEBIAN_FRONTEND=noninteractive apt-get -y \
     install --no-install-recommends $PACKAGES || exit 1
   configure_network_manager $NETWORK_MANAGER
+
+  # setup osapi extensions required for dashboard
+  # these are the required middleware extensions as of 12/20/2011
+  extensions="openstackx.extensions.admin.Admin
+              nova.api.openstack.v2.contrib.standard_extensions"
+
+  for e in $extensions ; do
+    grep -q "^--osapi_extension=$e" "$NOVA_CONF" ||
+      echo "--osapi_extension=$e" >>"$NOVA_CONF"
+  done
+
   nova_ctl all stop
 }
 
@@ -58,7 +69,7 @@
 }
 
 function db_changed {
-  DB_HOST=`relation-get db_host`
+  DB_HOST=`relation-get private-address`
   DB_PASSWORD=`relation-get password`
   if [[ -z $DB_HOST ]] || [[ -z $DB_PASSWORD ]] ; then
     echo "db_changed: DB_HOST || DB_PASSWORD not yet set. Exit 0 and retry"
@@ -89,6 +100,76 @@
   relation-set network_manager=$manager ec2_host=$(unit-get private-address)
 }
 
+function keystone_joined {
+  # inform keystone about our service and register its endpoints
+  # note: all 3 endpoint urls point to the same nova endpoint.
+  url="http://$(unit-get private-address):8774/v1.1/%tenant_id%"
+  relation-set service="nova" \
+    region="RegionOne" public_url=$url admin_url=$url internal_url=$url
+}
+
+function keystone_changed {
+ token=$(relation-get admin_token)
+ service_port=$(relation-get service_port)
+ auth_port=$(relation-get auth_port)
+ [[ -z "$token" ]] || [[ -z "$service_port" ]] || [[ -z "$auth_port" ]] &&
+    juju-log "keystone_changed: Peer not ready"  && exit 0
+  [[ "$token" == "-1" ]] &&
+    juju-log "keystone_changed: admin token error" && exit 1
+  juju-log "keystone_changed: Acquired admin token"
+  
+  keystone_host=`dig +short +search $(relation-get private-address)`
+  set_or_update "keystone_ec2_url" "http://$(relation-get private-address):5000/v2.0/ec2tokens"
+
+  # as of now (12/19/11), the default ec2 api pipelines need updating for keystone to work
+  # could/should be fixed in packaged config
+  ec2pipeline="ec2faultwrap logrequest totoken authtoken keystonecontext cloudrequest authorizer ec2executor"
+  osapipipeline="faultwrap authtoken keystonecontext ratelimit serialize extensions osapi_app_v2"
+
+  update_pipeline "ec2cloud" "$ec2pipeline"
+  update_pipeline "ec2admin" "$ec2pipeline"
+  update_pipeline "openstack_api_v2" "$osapipipeline"
+
+  if grep -q use_deprecated_auth $NOVA_CONF ; then
+    juju-log "keystone_changed: Disabling '--use_deprecated_auth"
+    sed -i '/--use_deprecated_auth/d' $NOVA_CONF
+  fi
+
+  ### This should be added to the default api-paste.ini
+  juju-log "Appending filter:totoken to paste config"
+  cat <<END >>$API_CONF
+
+[filter:totoken]
+paste.filter_factory = keystone.middleware.ec2_token:EC2Token.factory
+
+END
+
+  ## Append keystone auth config to the bottom of the paste ini
+  # this will probably need to be fixed so we dont append everytime
+  # the relation is run
+  juju-log "Updating $API_CONF with filter:keystonecontext and filter:authtoken"
+  cat <<END >>$API_CONF
+
+####
+# Keystone auth config added by Juju
+###
+[filter:keystonecontext]
+paste.filter_factory = keystone.middleware.nova_keystone_context:NovaKeystoneContext.factory
+
+[filter:authtoken]
+paste.filter_factory = keystone.middleware.auth_token:filter_factory
+service_protocol = http
+service_host = $keystone_host 
+service_port = $service_port
+auth_host = $keystone_host 
+auth_port = $auth_port 
+auth_protocol = http
+auth_uri = http://$keystone_host:$service_port/
+admin_token = $token 
+END
+    nova_ctl nova-api restart
+}
+
 case $ARG0 in
   "start"|"stop") nova_ctl all $ARG0 ;;
   "install") install_hook ;;
@@ -99,5 +180,7 @@
   "image-service-relation-joined") exit 0 ;;
   "image-service-relation-changed") image-service_changed ;;
   "nova-network-relation-joined") nova-network_joined ;;
+  "identity-service-relation-joined") keystone_joined ;;
+  "identity-service-relation-changed") keystone_changed ;;
   *) exit 0 ;;
 esac

=== modified file 'metadata.yaml'
--- metadata.yaml	2011-10-12 06:08:13 +0000
+++ metadata.yaml	2012-01-05 01:21:26 +0000
@@ -5,8 +5,6 @@
   Cloud controller node for Openstack nova.  Contains nova-schedule,
   nova-api, nova-network and nova-objectstore.
 provides:
-  cloud-controller:
-    interface: nova
   nova-network:
     interface: nova
 requires:
@@ -16,3 +14,5 @@
     interface: rabbitmq
   image-service:
     interface: glance
+  identity-service:
+    interface: keystone

=== modified file 'revision'
--- revision	2011-10-12 06:08:13 +0000
+++ revision	2012-01-05 01:21:26 +0000
@@ -1,1 +1,1 @@
-55
+71