openstack/deb-sahara
Code Issues Proposed changes

Merge "Fixing grenade job for upgrades from liberty"

Browse Source
This commit is contained in:
Jenkins 2015-10-15 15:43:55 +00:00 committed by Gerrit Code Review
commit 6a00db09c0
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/upgrade/ng-master.json
View File

@ -4,7 +4,7 @@
"plugin_name": "fake",
"hadoop_version": "0.1",
"node_processes": ["jobtracker", "namenode"],
"auto_security_group": false,
"auto_security_group": true,
"security_groups": ["SEC_GROUP"],
"floating_ip_pool": "FLOATING_IP_POOL"
}

2
devstack/upgrade/ng-worker.json
View File

@ -4,7 +4,7 @@
"plugin_name": "fake",
"hadoop_version": "0.1",
"node_processes": ["tasktracker", "datanode"],
"auto_security_group": false,
"auto_security_group": true,
"security_groups": ["SEC_GROUP"],
"floating_ip_pool": "FLOATING_IP_POOL"
}

7
devstack/upgrade/resources.sh
View File

@ -21,7 +21,7 @@ DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.small}
PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-public}
PRIVATE_NETWORK_NAME=${PRIVATE_NETWORK_NAME:-private}
# cirros image is not appropriate for cluster creation
SAHARA_IMAGE_NAME=${SAHARA_IMAGE_NAME:-fedora-20.x86_64}
SAHARA_IMAGE_NAME=${SAHARA_IMAGE_NAME:-fedora-heat-test-image}
SAHARA_IMAGE_USER=${SAHARA_IMAGE_USER:-fedora}
function _sahara_set_user {
@ -31,7 +31,7 @@ function _sahara_set_user {
}
function register_image {
eval $(openstack image show -f shell -c id $SAHARA_IMAGE_NAME)
eval $(openstack --os-image-api-version 1 image show -f shell -c id $SAHARA_IMAGE_NAME)
resource_save sahara image_id $id
sahara image-register --id $id --username $SAHARA_IMAGE_USER
sahara image-add-tag --id $id --tag fake
@ -129,6 +129,9 @@ function create {
while [[ $timeleft -gt 0 ]]; do
local cluster_state=$(sahara cluster-show --id $cluster_id | awk '$2 ~ /^status/ { print $4;exit }')
if [[ "$cluster_state" != "Active" ]]; then
if [[ "$cluster_state" == "Error" ]]; then
die $LINENO "Cluster is in Error state"
fi
echo "Cluster is still not in Active state"
sleep 10
timeleft=$((timeleft - 10))

8
devstack/upgrade/settings
View File

@ -1,13 +1,13 @@
register_project_for_upgrade sahara
register_db_to_save sahara
devstack_localrc base disable_service n-net
devstack_localrc base enable_service h-api h-api-cfn h-api-cw h-eng heat sahara q-agt q-dhcp q-l3 q-meta q-svc neutron tempest ceilometer-alarm-evaluator ceilometer-alarm-notifier ceilometer-anotification
devstack_localrc base IMAGE_URLS="http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
devstack_localrc base LIBS_FROM_GIT=python-saharaclient
devstack_localrc base enable_service h-api h-api-cfn h-api-cw h-eng heat q-agt q-dhcp q-l3 q-meta q-svc neutron tempest ceilometer-alarm-evaluator ceilometer-alarm-notifier ceilometer-anotification
devstack_localrc base IMAGE_URLS="http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
devstack_localrc base enable_plugin sahara git://git.openstack.org/openstack/sahara stable/liberty
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec"
devstack_localrc target disable_service n-net
devstack_localrc target enable_service h-api h-api-cfn h-api-cw h-eng heat q-agt q-dhcp q-l3 q-meta q-svc neutron tempest ceilometer-alarm-evaluator ceilometer-alarm-notifier ceilometer-anotification
devstack_localrc target IMAGE_URLS="http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
devstack_localrc target IMAGE_URLS="http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
devstack_localrc target enable_plugin sahara git://git.openstack.org/openstack/sahara
devstack_localrc target LIBS_FROM_GIT=python-saharaclient
devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec"

2
devstack/upgrade/shutdown.sh
View File

@ -12,7 +12,7 @@ source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/sahara
source $(dirname $(dirname $BASH_SOURCE))/plugin.sh
set -o xtrace