9 files changed, 74 insertions, 16 deletions
diff --git a/scripts/files/elements/ubuntu-db2/install.d/10-db2 b/scripts/files/elements/ubuntu-db2/install.d/10-db2
index 8628586..63bc3bf 100755
--- a/scripts/files/elements/ubuntu-db2/install.d/10-db2
+++ b/scripts/files/elements/ubuntu-db2/install.d/10-db2
@@ -12,6 +12,10 @@ DB2_PKG_LOCATION="/db2"
 mkdir ${DB2_PKG_LOCATION}
 cd ${DB2_PKG_LOCATION}
 
+# DB2 install requires the hostname to be resolved correctly
+host_name=`hostname`
+echo "127.0.0.1 ${host_name}" >> /etc/hosts
+
 tar -xvzf /tmp/in_target.d/db2.tar.gz
 
 # installing dependencies
@@ -41,3 +45,8 @@ su - db2inst1 -c "db2 update database manager configuration using svcename db2c_
 
 # Start the actual TCP/IP communication.
 su - db2inst1 -c "db2set DB2COMM=tcpip"
+
+# DB2 requires the hostname to be resolved correctly. Delete this entry from the
+# /etc/hosts since this is the hostname of the instance where the image is being
+# built. The correct hostname will be set in the guest agent.
+sed -i "/127.0.0.1[[:space:]]*${host_name}/d" /etc/hosts
diff --git a/scripts/files/requirements/fedora-requirements-liberty.txt b/scripts/files/requirements/fedora-requirements-liberty.txt
index 82ff409..f47cbad 100644
--- a/scripts/files/requirements/fedora-requirements-liberty.txt
+++ b/scripts/files/requirements/fedora-requirements-liberty.txt
@@ -14,6 +14,7 @@ passlib
 jinja2>=2.6
 python-neutronclient>=2.3.11,<3
 netifaces>=0.10.4
+oslo.context>=0.2.0,<=1.0.0
 oslo.config>=1.9.3,<1.10.0  # Apache-2.0
 oslo.messaging>=1.8.0  # Apache-2.0
 oslo.i18n>=1.5.0,<1.6.0  # Apache-2.0
diff --git a/scripts/files/requirements/fedora-requirements-mitaka.txt b/scripts/files/requirements/fedora-requirements-mitaka.txt
new file mode 100644
index 0000000..6f8c478
--- /dev/null
+++ b/scripts/files/requirements/fedora-requirements-mitaka.txt
@@ -0,0 +1,28 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+unittest2
+testtools
+extras
+python-novaclient>=2.22.0
+python-swiftclient>=2.2.0
+python-cinderclient>=1.1.0
+kombu>=2.5.0
+babel>=1.3
+python-heatclient>=0.3.0
+passlib
+jinja2>=2.6
+python-neutronclient>=2.3.11,<3
+netifaces>=0.10.4
+oslo.config>=1.9.3  # Apache-2.0
+oslo.messaging>=1.8.0  # Apache-2.0
+oslo.i18n>=1.5.0  # Apache-2.0
+oslo.serialization>=1.4.0               # Apache-2.0
+oslo.service>=0.1.0 # Apache-2.0
+oslo.utils>=1.4.0                       # Apache-2.0
+oslo.log>=1.8.0  # Apache-2.0
+osprofiler>=0.3.0
+oslo.concurrency>=1.8.0         # Apache-2.0
+pexpect>=3.1,!=3.3
+enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'  # BSD
+pycrypto>=2.6  # Public Domain
diff --git a/scripts/files/requirements/ubuntu-requirements-liberty.txt b/scripts/files/requirements/ubuntu-requirements-liberty.txt
index b094e2f..1f3d0d7 100644
--- a/scripts/files/requirements/ubuntu-requirements-liberty.txt
+++ b/scripts/files/requirements/ubuntu-requirements-liberty.txt
@@ -15,6 +15,7 @@ passlib
 jinja2
 python-neutronclient>=2.3.6,<3
 netifaces>=0.10.4
+oslo.context>=0.2.0,<=1.0.0
 oslo.config>=1.4.0 # Apache-2.0
 oslo.messaging>=1.4.0,!=1.5.0
 oslo.i18n>=1.0.0
diff --git a/scripts/files/requirements/ubuntu-requirements-mitaka.txt b/scripts/files/requirements/ubuntu-requirements-mitaka.txt
new file mode 100644
index 0000000..8724d16
--- /dev/null
+++ b/scripts/files/requirements/ubuntu-requirements-mitaka.txt
@@ -0,0 +1,27 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+unittest2
+testtools
+extras
+python-novaclient>=2.18.0
+python-swiftclient>=2.2.0
+python-cinderclient>=1.1.0
+kombu>=2.5.0
+six>=1.7.0
+babel
+python-heatclient>=0.2.9
+passlib
+jinja2
+python-neutronclient>=2.3.6,<3
+netifaces>=0.10.4
+oslo.config>=1.4.0 # Apache-2.0
+oslo.messaging>=1.4.0,!=1.5.0
+oslo.i18n>=1.0.0
+oslo.serialization>=1.0.0
+oslo.service>=0.1.0 # Apache-2.0
+oslo.utils>=1.1.0
+osprofiler>=0.3.0
+oslo.concurrency>=0.3.0
+enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'  # BSD
+pycrypto>=2.6  # Public Domain
diff --git a/scripts/local.conf.d/use_kvm.rc b/scripts/local.conf.d/use_kvm.rc
new file mode 100644
index 0000000..06bc2eb
--- /dev/null
+++ b/scripts/local.conf.d/use_kvm.rc
@@ -0,0 +1,4 @@
+[[local|localrc]]
+
+# force kvm as the libvirt type.
+LIBVIRT_TYPE=kvm
diff --git a/scripts/redstack b/scripts/redstack
index 0500e08..fbf8bea 100755
--- a/scripts/redstack
+++ b/scripts/redstack
@@ -1128,7 +1128,7 @@ function cmd_dsvm_gate_tests() {
     NETWORK_GATEWAY=${5:-'10.1.0.1'}
     ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'}
 
-    if [[ $BRANCH_OVERRIDE == "stable/liberty" || $BRANCH_OVERRIDE == "stable/liberty" ]]; then
+    if [[ $BRANCH_OVERRIDE == "stable/liberty" ]]; then
         # Devstack in liberty doesn't copy the clouds.yaml file to /etc so we need to
         # ensure we have access to the clouds.yaml file set up by devstack-gate
         sudo mkdir -p ~/.config/openstack
diff --git a/scripts/redstack.rc b/scripts/redstack.rc
index e3813be..9681f97 100644
--- a/scripts/redstack.rc
+++ b/scripts/redstack.rc
@@ -27,6 +27,7 @@ LIBS_FROM_GIT_ALL_OSLO=$(get_bool LIBS_FROM_GIT_ALL_OSLO false)
 
 # Don't include certain .rc files in local.conf.d by default
 USING_VAGRANT=$(get_bool USING_VAGRANT false)
+USE_KVM=$(get_bool USE_KVM false)
 USE_UUID_TOKEN=$(get_bool USE_UUID_TOKEN false)
 
 # Specify configuration for Ceilometer
diff --git a/tests/integration/int_tests.py b/tests/integration/int_tests.py
index c1a0344..e8f00fc 100644
--- a/tests/integration/int_tests.py
+++ b/tests/integration/int_tests.py
@@ -82,11 +82,11 @@ MAIN_RUNNER = None
 
 def initialize_rdl_config(config_file):
     from trove.common import cfg
-    from trove.openstack.common import log
+    from oslo_log import log
     from trove.db import get_db_api
     conf = cfg.CONF
     cfg.parse_args(['int_tests'], default_config_files=[config_file])
-    log.setup(None)
+    log.setup(conf, None)
     try:
         get_db_api().configure_db(conf)
         conf_file = conf.find_file(conf.api_paste_config)
@@ -96,17 +96,6 @@ def initialize_rdl_config(config_file):
         sys.exit("ERROR: %s" % error)
 
 
-def initialize_nova_flags(config_file):
-    from nova import flags
-    from nova import log as logging
-    from nova import service
-    from nova import utils
-
-    flags.parse_args(['int_tests'], default_config_files=[config_file])
-    logging.setup()
-    utils.monkey_patch()
-
-
 def _clean_up():
     """Shuts down any services this program has started and shows results."""
     from tests.util import report
@@ -227,8 +216,6 @@ def run_main(test_importer):
     if CONFIG.white_box:  # If white-box testing, set up the flags.
         # Handle loading up RDL's config file madness.
         initialize_rdl_config(rdl_config_file)
-        if nova_flag_file:
-            initialize_nova_flags(nova_flag_file)
 
     # Set up the report, and print out how we're running the tests.
     from tests.util import report