nova notifier: disable tests + update sample conf

The nova notifier is again broken due to Nova switch to oslo.messaging.

Anyway, it's likely that this code has been broken for a long time, as
it is not enabled nor tested on devstack anymore. And it's very unlikely
compatible with oslo.messaging.

This patch only disable the run of the tests for now, but we might
consider removing the code before i3 if nobody stands up and try to fix
it in a way or another.

This patch also update the configuration file for the new keystoneclient
release.

Change-Id: I679154baff476957f46e7930db69aeec7e368648

etc/ceilometer/ceilometer.conf.sample

@@ -829,6 +829,17 @@
 # Catalog header. (boolean value)
 #include_service_catalog=true
 
+# Used to control the use and type of token binding. Can be
+# set to: "disabled" to not check token binding. "permissive"
+# (default) to validate binding information if the bind type
+# is of a form known to the server and ignore it if not.
+# "strict" like "permissive" but if the bind type is unknown
+# the token will be rejected. "required" any form of token
+# binding is needed to be allowed. Finally the name of a
+# binding method that must be present in tokens. (string
+# value)
+#enforce_token_bind=permissive
+
 
 [matchmaker_redis]
 

run-tests.sh

@@ -13,12 +13,6 @@ if [ "$1" = "--coverage" ]; then
 	shift
 fi
 
-if [ ! "$COVERAGE_ARGS" ]; then
-	# Nova notifier tests
-	bash tools/init_testr_if_needed.sh
-	python setup.py testr --slowest --testr-args="--here=nova_tests $*"
-fi
-
 # Main unit tests
 MONGO_DATA=`mktemp -d /tmp/CEILO-MONGODB-XXXXX`
 MONGO_PORT=29000

test-requirements.txt

@@ -5,7 +5,6 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 httplib2>=0.7.5
-http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
 http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift
 mock>=1.0
 mox>=0.5.3

tools/init_testr_if_needed.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-# this is rather stupid script is needed as testr init
-# complains if there is already a repo.
-if [ -d nova_tests/.testrepository ]
-then
-    exit 0
-fi
-testr init -d nova_tests