Update 'str' to 'string' in config, correct some logging output

config.yaml

@@ -1,45 +1,45 @@
 options:
   nova-release:
     default: distro
-    type: string
+    type: str
     description: Nova PPA from which to install. (distro, trunk, milestone, milestone-proposed)
   nova-config:
     default: /etc/nova/nova.conf
-    type: string
+    type: str
     description: Full path to nova.conf
   rabbit-user:
     default: nova
-    type: string
+    type: str
     description: Username used to access rabbitmq queue
   rabbit-vhost:
     default: nova
-    type: string
+    type: str
     decsription: Rabbitmq vhost
   db-user:
     default: nova
-    type: string
+    type: str
     description: Username for database access
   nova-db:
     default: nova
-    type: string
+    type: str
     description: Database name
 
   # needed if using flatmanager
   bridge-interface:
     default: br100
-    type: string
+    type: str
     description: Bridge interface to be configured
   bridge-ip:
     default: 11.0.0.1
-    type: string
+    type: str
     description: IP to be assigned to bridge interface
   bridge-netmask:
     default: 255.255.255.0
-    type: string
+    type: str
     description: Netmask to be assigned to bridge interface
 
   # needed if using flatdhcpmanager
   flat-interface:
     default: eth1
-    type: string
+    type: str
     description: Network interface on which to build bridge

hooks/nova-compute-common

@@ -20,7 +20,7 @@ function set_or_update {
   [[ -z $KEY ]] && exit 1
   [[ -z $VALUE ]] && exit 1
   cat $NOVA_CONF | grep "\-\-$KEY=$VALUE" >/dev/null \
-   && ensemble-log "nova-cloud-controller: $KEY=$VALUE already set" exit 0
+   && ensemble-log "nova-compute: $KEY=$VALUE already set" exit 0
   if cat $NOVA_CONF | grep "\-\-$KEY=" >/dev/null ; then
     sed -i "s|\(--$KEY=\).*|\1$VALUE|" $NOVA_CONF
   else
@@ -123,7 +123,7 @@ function configure_network_manager {
 function add_ppa {
   # don't setup PPA, install from archive
   [[ $PPA == "distro" ]] && return 0
-  ensemble-log "nova-cloud-controller: Configuring PPA access for $PPA"
+  ensemble-log "nova-compute: Configuring PPA access for $PPA"
   . /etc/lsb-release
   PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
   echo "Executing: add-apt-repository \"$PPA_URL\"" || exit 1