Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 3512830 + 4ff7c77 commit 46f2beb2cf1ed71774382de5c27e0bbe33bbc099 Final Build committed Dec 3, 2011
Showing with 17 additions and 29 deletions.
  1. +1 −1 crowbar.yml
  2. +16 −0 smoketest/00-check-images.test
  3. +0 −28 smoketest/00-deploy-glance.test
View
@@ -66,7 +66,7 @@ locale_additions:
api_config_file: Config File
api_bind_open_address: Bind to All Addresses
api_bind_port: Access Port
- registry_header: API
+ registry_header: Registry
registry_log_file: Log File
registry_config_file: Config File
registry_bind_open_address: Bind to All Addresses
@@ -0,0 +1,16 @@
+#!/bin/bash
+auth_token=$(awk '/"token":/ {print $2}' <$LOGDIR/keystone-deployed.json |\
+ sed -e 's/"//g' -e 's/,//g')
+glance_port=$(awk '/"bind_port":/ {print $2}' <$LOGDIR/glance-deployed.json)
+glance_port=${glance_port%%,*}
+glance_nodes=$(knife_node_find 'roles:glance-server' FQDN)
+
+for node in $glance_nodes; do
+ if run_on $node -- glance -H $(name_to_ip $node) \
+ -p "$glance_port" -A "$auth_token" details |grep -q 'Status: active'; then
+ echo "Glance running on $node"
+ else
+ echo "Glance not running on $node!"
+ exit 1
+ fi
+done
@@ -1,28 +0,0 @@
-#!/bin/bash
-# Copyright 2011, Dell
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-cd "$HOME/testing/cli"
-echo "Deploying glance"
-if crowbar glance proposal create cluster1 && \
- crowbar glance proposal commit cluster1; then
- echo "Glance deployed."
- crowbar glance show cluster1 >"$LOGDIR/glance.json"
- exit 0
-else
- echo "Glance failed to deploy."
- crowbar glance proposal show cluster1 >"$LOGDIR/glance-failed.json"
- exit 1
-fi
-

0 comments on commit 46f2beb

Please sign in to comment.