Merge "Remove check for OVS_VERSION < 1.4"
diff --git a/data/devstack-plugins-registry.footer b/data/devstack-plugins-registry.footer
deleted file mode 100644
index 669cb8d..0000000
--- a/data/devstack-plugins-registry.footer
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Drivers
-=======
-
-+--------------------+-------------------------------------------------+------------------+
-|Plugin Name |URL |Comments |
-+--------------------+-------------------------------------------------+------------------+
-|dragonflow |git://git.openstack.org/openstack/dragonflow |[d1]_ |
-+--------------------+-------------------------------------------------+------------------+
-|odl |git://git.openstack.org/openstack/networking-odl |[d2]_ |
-+--------------------+-------------------------------------------------+------------------+
-
-.. [d1] demonstrates example of installing 3rd party SDN controller
-.. [d2] demonstrates a pretty advanced set of modes that that allow
- one to run OpenDayLight either from a pre-existing install, or
- also from source
-
-Alternate Configs
-=================
-
-+-------------+------------------------------------------------------------+------------+
-| Plugin Name | URL | Comments |
-| | | |
-+-------------+------------------------------------------------------------+------------+
-|glusterfs |git://git.openstack.org/openstack/devstack-plugin-glusterfs | |
-+-------------+------------------------------------------------------------+------------+
-| | | |
-+-------------+------------------------------------------------------------+------------+
diff --git a/data/devstack-plugins-registry.header b/data/devstack-plugins-registry.header
index c46ed97..46d5e60 100644
--- a/data/devstack-plugins-registry.header
+++ b/data/devstack-plugins-registry.header
@@ -19,6 +19,6 @@
namespace, which includes but is not limited to official OpenStack
projects.
-+------------------+-------------------------------------------------------------------------+
-|Plugin Name |URL |
-+------------------+-------------------------------------------------------------------------+
++----------------------------+-------------------------------------------------------------------------+
+|Plugin Name |URL |
++----------------------------+-------------------------------------------------------------------------+
diff --git a/doc/source/plugin-registry.rst b/doc/source/plugin-registry.rst
index b96883a..29b743f 100644
--- a/doc/source/plugin-registry.rst
+++ b/doc/source/plugin-registry.rst
@@ -1,7 +1,7 @@
..
- Note to reviewers: the intent of this file is to be easy for
- community members to update. As such fast approving (single core +2)
- is fine as long as you've identified that the plugin listed actually exists.
+ Note to patch submitters: this file is covered by a periodic proposal
+ job. You should edit the files data/devstack-plugins-registry.footer
+ data/devstack-plugins-registry.header instead of this one.
==========================
DevStack Plugin Registry
@@ -12,44 +12,186 @@
exist. Any project that wishes to list their plugin here is welcomed
to.
-Official OpenStack Projects
-===========================
+Detected Plugins
+================
-The following are plugins that exist for official OpenStack projects.
+The following are plugins that a script has found in the openstack/
+namespace, which includes but is not limited to official OpenStack
+projects.
-+------------------+---------------------------------------------+--------------------+
-|Plugin Name |URL |Comments |
-+------------------+---------------------------------------------+--------------------+
-|aodh |git://git.openstack.org/openstack/aodh | alarming |
-+------------------+---------------------------------------------+--------------------+
-|barbican |git://git.openstack.org/openstack/barbican | key management |
-+------------------+---------------------------------------------+--------------------+
-|ceilometer |git://git.openstack.org/openstack/ceilometer | metering |
-+------------------+---------------------------------------------+--------------------+
-|congress |git://git.openstack.org/openstack/congress | governance |
-+------------------+---------------------------------------------+--------------------+
-|cue |git://git.openstack.org/openstack/cue | message-broker |
-+------------------+---------------------------------------------+--------------------+
-|gnocchi |git://git.openstack.org/openstack/gnocchi | metric |
-+------------------+---------------------------------------------+--------------------+
-|ironic |git://git.openstack.org/openstack/ironic | baremetal |
-+------------------+---------------------------------------------+--------------------+
-|magnum |git://git.openstack.org/openstack/magnum | |
-+------------------+---------------------------------------------+--------------------+
-|manila |git://git.openstack.org/openstack/manila | file shares |
-+------------------+---------------------------------------------+--------------------+
-|mistral |git://git.openstack.org/openstack/mistral | |
-+------------------+---------------------------------------------+--------------------+
-|rally |git://git.openstack.org/openstack/rally | |
-+------------------+---------------------------------------------+--------------------+
-|sahara |git://git.openstack.org/openstack/sahara | |
-+------------------+---------------------------------------------+--------------------+
-|trove |git://git.openstack.org/openstack/trove | |
-+------------------+---------------------------------------------+--------------------+
-|zaqar |git://git.openstack.org/openstack/zaqar | |
-+------------------+---------------------------------------------+--------------------+
-
-
++----------------------------+-------------------------------------------------------------------------+
+|Plugin Name |URL |
++----------------------------+-------------------------------------------------------------------------+
+|aodh |git://git.openstack.org/openstack/aodh |
++----------------------------+-------------------------------------------------------------------------+
+|app-catalog-ui |git://git.openstack.org/openstack/app-catalog-ui |
++----------------------------+-------------------------------------------------------------------------+
+|astara |git://git.openstack.org/openstack/astara |
++----------------------------+-------------------------------------------------------------------------+
+|barbican |git://git.openstack.org/openstack/barbican |
++----------------------------+-------------------------------------------------------------------------+
+|blazar |git://git.openstack.org/openstack/blazar |
++----------------------------+-------------------------------------------------------------------------+
+|ceilometer |git://git.openstack.org/openstack/ceilometer |
++----------------------------+-------------------------------------------------------------------------+
+|ceilometer-powervm |git://git.openstack.org/openstack/ceilometer-powervm |
++----------------------------+-------------------------------------------------------------------------+
+|cerberus |git://git.openstack.org/openstack/cerberus |
++----------------------------+-------------------------------------------------------------------------+
+|cloudkitty |git://git.openstack.org/openstack/cloudkitty |
++----------------------------+-------------------------------------------------------------------------+
+|collectd-ceilometer-plugin |git://git.openstack.org/openstack/collectd-ceilometer-plugin |
++----------------------------+-------------------------------------------------------------------------+
+|congress |git://git.openstack.org/openstack/congress |
++----------------------------+-------------------------------------------------------------------------+
+|cue |git://git.openstack.org/openstack/cue |
++----------------------------+-------------------------------------------------------------------------+
+|designate |git://git.openstack.org/openstack/designate |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-amqp1 |git://git.openstack.org/openstack/devstack-plugin-amqp1 |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-bdd |git://git.openstack.org/openstack/devstack-plugin-bdd |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-ceph |git://git.openstack.org/openstack/devstack-plugin-ceph |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-glusterfs |git://git.openstack.org/openstack/devstack-plugin-glusterfs |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-hdfs |git://git.openstack.org/openstack/devstack-plugin-hdfs |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-pika |git://git.openstack.org/openstack/devstack-plugin-pika |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-sheepdog |git://git.openstack.org/openstack/devstack-plugin-sheepdog |
++----------------------------+-------------------------------------------------------------------------+
+|devstack-plugin-zmq |git://git.openstack.org/openstack/devstack-plugin-zmq |
++----------------------------+-------------------------------------------------------------------------+
+|dragonflow |git://git.openstack.org/openstack/dragonflow |
++----------------------------+-------------------------------------------------------------------------+
+|drbd-devstack |git://git.openstack.org/openstack/drbd-devstack |
++----------------------------+-------------------------------------------------------------------------+
+|ec2-api |git://git.openstack.org/openstack/ec2-api |
++----------------------------+-------------------------------------------------------------------------+
+|freezer |git://git.openstack.org/openstack/freezer |
++----------------------------+-------------------------------------------------------------------------+
+|freezer-api |git://git.openstack.org/openstack/freezer-api |
++----------------------------+-------------------------------------------------------------------------+
+|freezer-web-ui |git://git.openstack.org/openstack/freezer-web-ui |
++----------------------------+-------------------------------------------------------------------------+
+|gce-api |git://git.openstack.org/openstack/gce-api |
++----------------------------+-------------------------------------------------------------------------+
+|gnocchi |git://git.openstack.org/openstack/gnocchi |
++----------------------------+-------------------------------------------------------------------------+
+|ironic |git://git.openstack.org/openstack/ironic |
++----------------------------+-------------------------------------------------------------------------+
+|ironic-inspector |git://git.openstack.org/openstack/ironic-inspector |
++----------------------------+-------------------------------------------------------------------------+
+|kingbird |git://git.openstack.org/openstack/kingbird |
++----------------------------+-------------------------------------------------------------------------+
+|kuryr |git://git.openstack.org/openstack/kuryr |
++----------------------------+-------------------------------------------------------------------------+
+|magnum |git://git.openstack.org/openstack/magnum |
++----------------------------+-------------------------------------------------------------------------+
+|manila |git://git.openstack.org/openstack/manila |
++----------------------------+-------------------------------------------------------------------------+
+|mistral |git://git.openstack.org/openstack/mistral |
++----------------------------+-------------------------------------------------------------------------+
+|monasca-api |git://git.openstack.org/openstack/monasca-api |
++----------------------------+-------------------------------------------------------------------------+
+|murano |git://git.openstack.org/openstack/murano |
++----------------------------+-------------------------------------------------------------------------+
+|networking-6wind |git://git.openstack.org/openstack/networking-6wind |
++----------------------------+-------------------------------------------------------------------------+
+|networking-bagpipe |git://git.openstack.org/openstack/networking-bagpipe |
++----------------------------+-------------------------------------------------------------------------+
+|networking-bgpvpn |git://git.openstack.org/openstack/networking-bgpvpn |
++----------------------------+-------------------------------------------------------------------------+
+|networking-calico |git://git.openstack.org/openstack/networking-calico |
++----------------------------+-------------------------------------------------------------------------+
+|networking-cisco |git://git.openstack.org/openstack/networking-cisco |
++----------------------------+-------------------------------------------------------------------------+
+|networking-fortinet |git://git.openstack.org/openstack/networking-fortinet |
++----------------------------+-------------------------------------------------------------------------+
+|networking-generic-switch |git://git.openstack.org/openstack/networking-generic-switch |
++----------------------------+-------------------------------------------------------------------------+
+|networking-infoblox |git://git.openstack.org/openstack/networking-infoblox |
++----------------------------+-------------------------------------------------------------------------+
+|networking-l2gw |git://git.openstack.org/openstack/networking-l2gw |
++----------------------------+-------------------------------------------------------------------------+
+|networking-midonet |git://git.openstack.org/openstack/networking-midonet |
++----------------------------+-------------------------------------------------------------------------+
+|networking-mlnx |git://git.openstack.org/openstack/networking-mlnx |
++----------------------------+-------------------------------------------------------------------------+
+|networking-nec |git://git.openstack.org/openstack/networking-nec |
++----------------------------+-------------------------------------------------------------------------+
+|networking-odl |git://git.openstack.org/openstack/networking-odl |
++----------------------------+-------------------------------------------------------------------------+
+|networking-ofagent |git://git.openstack.org/openstack/networking-ofagent |
++----------------------------+-------------------------------------------------------------------------+
+|networking-ovn |git://git.openstack.org/openstack/networking-ovn |
++----------------------------+-------------------------------------------------------------------------+
+|networking-ovs-dpdk |git://git.openstack.org/openstack/networking-ovs-dpdk |
++----------------------------+-------------------------------------------------------------------------+
+|networking-plumgrid |git://git.openstack.org/openstack/networking-plumgrid |
++----------------------------+-------------------------------------------------------------------------+
+|networking-powervm |git://git.openstack.org/openstack/networking-powervm |
++----------------------------+-------------------------------------------------------------------------+
+|networking-sfc |git://git.openstack.org/openstack/networking-sfc |
++----------------------------+-------------------------------------------------------------------------+
+|networking-vsphere |git://git.openstack.org/openstack/networking-vsphere |
++----------------------------+-------------------------------------------------------------------------+
+|neutron |git://git.openstack.org/openstack/neutron |
++----------------------------+-------------------------------------------------------------------------+
+|neutron-lbaas |git://git.openstack.org/openstack/neutron-lbaas |
++----------------------------+-------------------------------------------------------------------------+
+|neutron-lbaas-dashboard |git://git.openstack.org/openstack/neutron-lbaas-dashboard |
++----------------------------+-------------------------------------------------------------------------+
+|neutron-vpnaas |git://git.openstack.org/openstack/neutron-vpnaas |
++----------------------------+-------------------------------------------------------------------------+
+|nova-docker |git://git.openstack.org/openstack/nova-docker |
++----------------------------+-------------------------------------------------------------------------+
+|nova-powervm |git://git.openstack.org/openstack/nova-powervm |
++----------------------------+-------------------------------------------------------------------------+
+|octavia |git://git.openstack.org/openstack/octavia |
++----------------------------+-------------------------------------------------------------------------+
+|osprofiler |git://git.openstack.org/openstack/osprofiler |
++----------------------------+-------------------------------------------------------------------------+
+|rally |git://git.openstack.org/openstack/rally |
++----------------------------+-------------------------------------------------------------------------+
+|sahara |git://git.openstack.org/openstack/sahara |
++----------------------------+-------------------------------------------------------------------------+
+|sahara-dashboard |git://git.openstack.org/openstack/sahara-dashboard |
++----------------------------+-------------------------------------------------------------------------+
+|scalpels |git://git.openstack.org/openstack/scalpels |
++----------------------------+-------------------------------------------------------------------------+
+|searchlight |git://git.openstack.org/openstack/searchlight |
++----------------------------+-------------------------------------------------------------------------+
+|senlin |git://git.openstack.org/openstack/senlin |
++----------------------------+-------------------------------------------------------------------------+
+|smaug |git://git.openstack.org/openstack/smaug |
++----------------------------+-------------------------------------------------------------------------+
+|solum |git://git.openstack.org/openstack/solum |
++----------------------------+-------------------------------------------------------------------------+
+|tacker |git://git.openstack.org/openstack/tacker |
++----------------------------+-------------------------------------------------------------------------+
+|tap-as-a-service |git://git.openstack.org/openstack/tap-as-a-service |
++----------------------------+-------------------------------------------------------------------------+
+|tricircle |git://git.openstack.org/openstack/tricircle |
++----------------------------+-------------------------------------------------------------------------+
+|trove |git://git.openstack.org/openstack/trove |
++----------------------------+-------------------------------------------------------------------------+
+|trove-dashboard |git://git.openstack.org/openstack/trove-dashboard |
++----------------------------+-------------------------------------------------------------------------+
+|vitrage |git://git.openstack.org/openstack/vitrage |
++----------------------------+-------------------------------------------------------------------------+
+|vitrage-dashboard |git://git.openstack.org/openstack/vitrage-dashboard |
++----------------------------+-------------------------------------------------------------------------+
+|vmware-nsx |git://git.openstack.org/openstack/vmware-nsx |
++----------------------------+-------------------------------------------------------------------------+
+|watcher |git://git.openstack.org/openstack/watcher |
++----------------------------+-------------------------------------------------------------------------+
+|watcher-dashboard |git://git.openstack.org/openstack/watcher-dashboard |
++----------------------------+-------------------------------------------------------------------------+
+|zaqar |git://git.openstack.org/openstack/zaqar |
++----------------------------+-------------------------------------------------------------------------+
Drivers
=======
@@ -78,34 +220,3 @@
+-------------+------------------------------------------------------------+------------+
| | | |
+-------------+------------------------------------------------------------+------------+
-
-Additional Services
-===================
-
-+-----------------+------------------------------------------------------------+------------+
-| Plugin Name | URL | Comments |
-| | | |
-+-----------------+------------------------------------------------------------+------------+
-|amqp1 |git://git.openstack.org/openstack/devstack-plugin-amqp1 | |
-+-----------------+------------------------------------------------------------+------------+
-|bdd |git://git.openstack.org/openstack/devstack-plugin-bdd | |
-+-----------------+------------------------------------------------------------+------------+
-|ec2-api |git://git.openstack.org/openstack/ec2-api |[as1]_ |
-+-----------------+------------------------------------------------------------+------------+
-|glusterfs |git://git.openstack.org/openstack/devstack-plugin-glusterfs | |
-+-----------------+------------------------------------------------------------+------------+
-|hdfs |git://git.openstack.org/openstack/devstack-plugin-hdfs | |
-+-----------------+------------------------------------------------------------+------------+
-|ironic-inspector |git://git.openstack.org/openstack/ironic-inspector | |
-+-----------------+------------------------------------------------------------+------------+
-|pika |git://git.openstack.org/openstack/devstack-plugin-pika | |
-+-----------------+------------------------------------------------------------+------------+
-|sheepdog |git://git.openstack.org/openstack/devstack-plugin-sheepdog | |
-+-----------------+------------------------------------------------------------+------------+
-|zmq |git://git.openstack.org/openstack/devstack-plugin-zmq | |
-+-----------------+------------------------------------------------------------+------------+
-| | | |
-+-----------------+------------------------------------------------------------+------------+
-
-.. [as1] first functional devstack plugin, hence why used in most of
- the examples.
diff --git a/exercises/euca.sh b/exercises/euca.sh
index c2957e2..60e7d8c 100755
--- a/exercises/euca.sh
+++ b/exercises/euca.sh
@@ -17,7 +17,6 @@
# an error. It is also useful for following allowing as the install occurs.
set -o xtrace
-
# Settings
# ========
@@ -89,7 +88,8 @@
VOLUME_ZONE=`euca-describe-availability-zones | head -n1 | cut -f2`
die_if_not_set $LINENO VOLUME_ZONE "Failure to find zone for volume"
- VOLUME=`euca-create-volume -s 1 -z $VOLUME_ZONE | cut -f2`
+ VOLUME=`euca-create-volume -s 1 -z $VOLUME_ZONE` || die $LINENO "Failure to create volume"
+ VOLUME=`echo "$VOLUME" | cut -f2`
die_if_not_set $LINENO VOLUME "Failure to create volume"
# Test that volume has been created
diff --git a/functions-common b/functions-common
index a26cc50..9e6fef2 100644
--- a/functions-common
+++ b/functions-common
@@ -322,7 +322,7 @@
# XXX: old code paths seem to have assumed SUSE platforms also
# had "yum". Keep this ordered above yum so we don't try to
# install the rh package. suse calls it just "lsb"
- sudo zypper -y install lsb
+ sudo zypper -n install lsb
elif [[ -x $(which dnf 2>/dev/null) ]]; then
sudo dnf install -y redhat-lsb-core
elif [[ -x $(which yum 2>/dev/null) ]]; then
@@ -380,7 +380,8 @@
DISTRO="sle${os_RELEASE%.*}"
elif [[ "$os_VENDOR" =~ (Red.*Hat) || \
"$os_VENDOR" =~ (CentOS) || \
- "$os_VENDOR" =~ (OracleLinux) ]]; then
+ "$os_VENDOR" =~ (OracleLinux) || \
+ "$os_VENDOR" =~ (Virtuozzo) ]]; then
# Drop the . release as we assume it's compatible
# XXX re-evaluate when we get RHEL10
DISTRO="rhel${os_RELEASE::1}"
@@ -389,7 +390,26 @@
elif [[ "$os_VENDOR" =~ (kvmibm) ]]; then
DISTRO="${os_VENDOR}${os_RELEASE::1}"
else
- die $LINENO "Unable to determine DISTRO"
+ # We can't make a good choice here. Setting a sensible DISTRO
+ # is part of the problem, but not the major issue -- we really
+ # only use DISTRO in the code as a fine-filter.
+ #
+ # The bigger problem is categorising the system into one of
+ # our two big categories as Ubuntu/Debian-ish or
+ # Fedora/CentOS-ish.
+ #
+ # The setting of os_PACKAGE above is only set to "deb" based
+ # on a hard-coded list of vendor names ... thus we will
+ # default to thinking unknown distros are RPM based
+ # (ie. is_ubuntu does not match). But the platform will then
+ # also not match in is_fedora, because that also has a list of
+ # names.
+ #
+ # So, if you are reading this, getting your distro supported
+ # is really about making sure it matches correctly in these
+ # functions. Then you can choose a sensible way to construct
+ # DISTRO based on your distros release approach.
+ die $LINENO "Unable to determine DISTRO, can not continue."
fi
typeset -xr DISTRO
}
@@ -421,7 +441,7 @@
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \
- [ "$os_VENDOR" = "CloudLinux" ] || [ "$os_VENDOR" = "kvmibm" ]
+ [ "$os_VENDOR" = "Virtuozzo" ] || [ "$os_VENDOR" = "kvmibm" ]
}
@@ -433,7 +453,7 @@
GetOSVersion
fi
- [ "$os_VENDOR" = "openSUSE" ] || [ "$os_VENDOR" = "SUSE LINUX" ]
+ [[ "$os_VENDOR" =~ (openSUSE) || "$os_VENDOR" == "SUSE LINUX" ]]
}
diff --git a/lib/databases/postgresql b/lib/databases/postgresql
index 852bac4..14425a5 100644
--- a/lib/databases/postgresql
+++ b/lib/databases/postgresql
@@ -47,7 +47,7 @@
}
function configure_database_postgresql {
- local pg_conf pg_dir pg_hba root_roles
+ local pg_conf pg_dir pg_hba root_roles version
echo_summary "Configuring and starting PostgreSQL"
if is_fedora; then
pg_hba=/var/lib/pgsql/data/pg_hba.conf
@@ -56,6 +56,13 @@
sudo postgresql-setup initdb
fi
elif is_ubuntu; then
+ version=`psql --version | cut -d ' ' -f3 | cut -d. -f1-2`
+ if vercmp $version '>=' 9.3; then
+ if [ -z "`pg_lsclusters -h`" ]; then
+ echo 'No PostgreSQL clusters exist; will create one'
+ sudo pg_createcluster $version main --start
+ fi
+ fi
pg_dir=`find /etc/postgresql -name pg_hba.conf|xargs dirname`
pg_hba=$pg_dir/pg_hba.conf
pg_conf=$pg_dir/postgresql.conf
diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 7d6e881..e06a020 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -486,8 +486,7 @@
}
function create_nova_conf_neutron {
- iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API"
-
+ iniset $NOVA_CONF DEFAULT use_neutron True
iniset $NOVA_CONF neutron auth_type "password"
iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME"
@@ -502,7 +501,6 @@
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
- iniset $NOVA_CONF DEFAULT security_group_api neutron
fi
# optionally set options in nova_conf
diff --git a/lib/tempest b/lib/tempest
index 8d3bf7c..3b8a888 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -414,12 +414,15 @@
if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
iniset $TEMPEST_CONFIG orchestration image_ref $(basename "${HEAT_CFN_IMAGE_URL%.*}")
fi
- # build a specialized heat flavor
- available_flavors=$(nova flavor-list)
- if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
- nova flavor-create m1.heat 451 512 0 1
+ # Nova might not be enabled, especially when we want to test tempest scenario/API that only create Neutron resources
+ if is_service_enabled nova; then
+ # build a specialized heat flavor
+ available_flavors=$(nova flavor-list)
+ if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
+ nova flavor-create m1.heat 451 512 0 1
+ fi
+ iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
fi
- iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
iniset $TEMPEST_CONFIG orchestration build_timeout 900
iniset $TEMPEST_CONFIG orchestration stack_owner_role "_member_"
fi
@@ -554,9 +557,9 @@
iniset $TEMPEST_CONFIG auth tempest_roles "Member"
if [[ $TEMPEST_USE_TEST_ACCOUNTS == "True" ]]; then
if [[ $TEMPEST_HAS_ADMIN == "True" ]]; then
- tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password $admin_password --os-tenant-name $admin_tenant_name -r $TEMPEST_CONCURRENCY --with-admin etc/accounts.yaml
+ tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_tenant_name -r $TEMPEST_CONCURRENCY --with-admin etc/accounts.yaml
else
- tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password $admin_password --os-tenant-name $admin_tenant_name -r $TEMPEST_CONCURRENCY etc/accounts.yaml
+ tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_tenant_name -r $TEMPEST_CONCURRENCY etc/accounts.yaml
fi
iniset $TEMPEST_CONFIG auth use_dynamic_credentials False
iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml"
diff --git a/stackrc b/stackrc
index 7294f7b..8f595ef 100644
--- a/stackrc
+++ b/stackrc
@@ -625,7 +625,7 @@
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";;
ironic)
# Ironic can do both partition and full disk images, depending on the driver
- if [[ "$IRONIC_DEPLOY_DRIVER" == "agent_ssh" ]]; then
+ if [[ -z "${IRONIC_DEPLOY_DRIVER%%agent*}" ]]; then
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-disk}
else
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}
diff --git a/tests/test_package_ordering.sh b/tests/test_package_ordering.sh
index a568abf..bfc2a19 100755
--- a/tests/test_package_ordering.sh
+++ b/tests/test_package_ordering.sh
@@ -7,6 +7,7 @@
source $TOP/tests/unittest.sh
+export LC_ALL=en_US.UTF-8
PKG_FILES=$(find $TOP/files/debs $TOP/files/rpms $TOP/files/rpms-suse -type f)
TMPDIR=$(mktemp -d)
diff --git a/tools/generate-devstack-plugins-list.sh b/tools/generate-devstack-plugins-list.sh
index b7817a0..be3f60a 100644
--- a/tools/generate-devstack-plugins-list.sh
+++ b/tools/generate-devstack-plugins-list.sh
@@ -41,18 +41,22 @@
(
declare -A plugins
-test -r data/devstack-plugins-registry.header && cat data/devstack-plugins-registry.header
+if [[ -r data/devstack-plugins-registry.header ]]; then
+ cat data/devstack-plugins-registry.header
+fi
sorted_plugins=$(python tools/generate-devstack-plugins-list.py)
for k in ${sorted_plugins}; do
- project=${k:0:18}
+ project=${k:0:28}
giturl="git://git.openstack.org/openstack/${k:0:26}"
- printf "|%-18s|%-73s|\n" "${project}" "${giturl}"
- printf "+------------------+-------------------------------------------------------------------------+\n"
+ printf "|%-28s|%-73s|\n" "${project}" "${giturl}"
+ printf "+----------------------------+-------------------------------------------------------------------------+\n"
done
-test -r data/devstack-plugins-registry.footer && cat data/devstack-plugins-registry.footer
+if [[ -r data/devstack-plugins-registry.footer ]]; then
+ cat data/devstack-plugins-registry.footer
+fi
) > doc/source/plugin-registry.rst
if [[ -n ${1} ]]; then
diff --git a/tools/worlddump.py b/tools/worlddump.py
index 01f601c..72a257f 100755
--- a/tools/worlddump.py
+++ b/tools/worlddump.py
@@ -58,8 +58,8 @@
try:
subprocess.check_call(cmd, shell=True)
print
- except subprocess.CalledProcessError:
- print "*** Failed to run: %s" % cmd
+ except subprocess.CalledProcessError as e:
+ print "*** Failed to run '%(cmd)s': %(err)s" % {'cmd': cmd, 'err': e}
def _find_cmd(cmd):
diff --git a/tox.ini b/tox.ini
index ef557fb..3dfc377 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@
# against devstack, just set BASHATE_INSTALL_PATH=/path/... to your
# modified bashate tree
deps =
- {env:BASHATE_INSTALL_PATH:bashate==0.4.0}
+ {env:BASHATE_INSTALL_PATH:bashate==0.5.0}
whitelist_externals = bash
commands = bash -c "find {toxinidir} \
-not \( -type d -name .?\* -prune \) \
@@ -22,9 +22,10 @@
-not -name \*~ \
-not -name \*.md \
-not -name stack-screenrc \
+ -not -name \*.orig \
+ -not -name \*.rej \
\( \
-name \*.sh -or \
- -name \*.orig -or \
-name \*rc -or \
-name functions\* -or \
-wholename \*/inc/\* -or \