Merge "nova needs python-feedparser"
diff --git a/files/apts/nova b/files/apts/nova
index bb0e0ce..bc0c23b 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -2,7 +2,8 @@
dnsmasq-utils # for dhcp_release only available in dist:oneiric
kpartx
parted
-arping # used for send_arp_for_ha option in nova-network
+arping # only available in dist:natty
+iputils-arping # only available in dist:oneiric
mysql-server # NOPRIME
python-mysqldb
python-xattr # needed for glance which is needed for nova --- this shouldn't be here
diff --git a/files/glance-api.conf b/files/glance-api.conf
index 1bbd58e..6c670b5 100644
--- a/files/glance-api.conf
+++ b/files/glance-api.conf
@@ -141,30 +141,32 @@
[pipeline:glance-api]
#pipeline = versionnegotiation context apiv1app
# NOTE: use the following pipeline for keystone
-pipeline = versionnegotiation authtoken context apiv1app
+pipeline = versionnegotiation authtoken auth-context apiv1app
# To enable Image Cache Management API replace pipeline with below:
# pipeline = versionnegotiation context imagecache apiv1app
# NOTE: use the following pipeline for keystone auth (with caching)
-# pipeline = versionnegotiation authtoken context imagecache apiv1app
-
-[pipeline:versions]
-pipeline = versionsapp
-
-[app:versionsapp]
-paste.app_factory = glance.api.versions:app_factory
+# pipeline = versionnegotiation authtoken auth-context imagecache apiv1app
[app:apiv1app]
-paste.app_factory = glance.api.v1.router:app_factory
+paste.app_factory = glance.common.wsgi:app_factory
+glance.app_factory = glance.api.v1.router:API
[filter:versionnegotiation]
-paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory
+paste.filter_factory = glance.common.wsgi:filter_factory
+glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter
-[filter:imagecache]
-paste.filter_factory = glance.api.middleware.image_cache:filter_factory
+[filter:cache]
+paste.filter_factory = glance.common.wsgi:filter_factory
+glance.filter_factory = glance.api.middleware.cache:CacheFilter
+
+[filter:cachemanage]
+paste.filter_factory = glance.common.wsgi:filter_factory
+glance.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter
[filter:context]
-paste.filter_factory = glance.common.context:filter_factory
+paste.filter_factory = glance.common.wsgi:filter_factory
+glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory
@@ -176,3 +178,7 @@
auth_protocol = http
auth_uri = http://127.0.0.1:5000/
admin_token = %SERVICE_TOKEN%
+
+[filter:auth-context]
+paste.filter_factory = glance.common.wsgi:filter_factory
+glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware
diff --git a/files/glance-registry.conf b/files/glance-registry.conf
index 1e04186..e732e86 100644
--- a/files/glance-registry.conf
+++ b/files/glance-registry.conf
@@ -46,14 +46,16 @@
[pipeline:glance-registry]
#pipeline = context registryapp
# NOTE: use the following pipeline for keystone
-pipeline = authtoken keystone_shim context registryapp
+pipeline = authtoken auth-context context registryapp
[app:registryapp]
-paste.app_factory = glance.registry.server:app_factory
+paste.app_factory = glance.common.wsgi:app_factory
+glance.app_factory = glance.registry.api.v1:API
[filter:context]
context_class = glance.registry.context.RequestContext
-paste.filter_factory = glance.common.context:filter_factory
+paste.filter_factory = glance.common.wsgi:filter_factory
+glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory
@@ -66,5 +68,7 @@
auth_uri = http://127.0.0.1:5000/
admin_token = %SERVICE_TOKEN%
-[filter:keystone_shim]
-paste.filter_factory = keystone.middleware.glance_auth_token:filter_factory
+[filter:auth-context]
+context_class = glance.registry.context.RequestContext
+paste.filter_factory = glance.common.wsgi:filter_factory
+glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware
diff --git a/files/swift/proxy-server.conf b/files/swift/proxy-server.conf
index 2db6d32..d7ed485 100644
--- a/files/swift/proxy-server.conf
+++ b/files/swift/proxy-server.conf
@@ -16,7 +16,7 @@
use = egg:swiftkeystone2#keystone2
keystone_admin_token = %SERVICE_TOKEN%
keystone_url = http://localhost:35357/v2.0
-keystone_admin_group = Member
+keystone_swift_operator_roles = Member
[filter:tempauth]
use = egg:swift#tempauth
diff --git a/stack.sh b/stack.sh
index c7c5293..f978e44 100755
--- a/stack.sh
+++ b/stack.sh
@@ -118,7 +118,7 @@
echo "Copying files to stack user"
STACK_DIR="$DEST/${PWD##*/}"
- cp -r -f "$PWD" "$STACK_DIR"
+ cp -r -f -T "$PWD" "$STACK_DIR"
chown -R stack "$STACK_DIR"
if [[ "$SHELL_AFTER_RUN" != "no" ]]; then
exec su -c "set -e; cd $STACK_DIR; bash stack.sh; bash" stack
@@ -195,8 +195,8 @@
local testval=$2
[[ -z "$testval" ]] && { echo "$default"; return; }
- [[ "0 no false" =~ "$testval" ]] && { echo "False"; return; }
- [[ "1 yes true" =~ "$testval" ]] && { echo "True"; return; }
+ [[ "0 no false False FALSE" =~ "$testval" ]] && { echo "False"; return; }
+ [[ "1 yes true True TRUE" =~ "$testval" ]] && { echo "True"; return; }
echo "$default"
}
@@ -398,8 +398,8 @@
# - We are parsing the packages files and detecting metadatas.
# - If there is a NOPRIME as comment mean we are not doing the install
# just yet.
-# - If we have the meta-keyword distro:DISTRO or
-# distro:DISTRO1,DISTRO2 it will be installed only for those
+# - If we have the meta-keyword dist:DISTRO or
+# dist:DISTRO1,DISTRO2 it will be installed only for those
# distros (case insensitive).
function get_packages() {
local file_to_parse="general"
diff --git a/tools/build_ci_config.sh b/tools/build_ci_config.sh
index 0e43aa4..90b8abf 100755
--- a/tools/build_ci_config.sh
+++ b/tools/build_ci_config.sh
@@ -199,7 +199,7 @@
apiver = v2.0
user = admin
password = $ADMIN_PASSWORD
-tenant_id = 1
+tenant_name = admin
[nova]
host = $HOST_IP