diff -Nru puppet-module-oslo-16.3.0/CONTRIBUTING.rst puppet-module-oslo-17.4.0/CONTRIBUTING.rst
--- puppet-module-oslo-16.3.0/CONTRIBUTING.rst	1970-01-01 00:00:00.000000000 +0000
+++ puppet-module-oslo-17.4.0/CONTRIBUTING.rst	2020-09-24 02:48:54.000000000 +0000
@@ -0,0 +1,19 @@
+The source repository for this project can be found at:
+
+   https://opendev.org/openstack/puppet-oslo
+
+Pull requests submitted through GitHub are not monitored.
+
+To start contributing to OpenStack, follow the steps in the contribution guide
+to set up and use Gerrit:
+
+   https://docs.openstack.org/contributors/code-and-documentation/quick-start.html
+
+Bugs should be filed on Launchpad:
+
+   https://bugs.launchpad.net/puppet-oslo
+
+For more specific information about contributing to this repository, see the
+Puppet OpenStack contributor guide:
+
+   https://docs.openstack.org/puppet-openstack-guide/latest/contributor/contributing.html
diff -Nru puppet-module-oslo-16.3.0/debian/changelog puppet-module-oslo-17.4.0/debian/changelog
--- puppet-module-oslo-16.3.0/debian/changelog	2020-05-10 09:26:17.000000000 +0000
+++ puppet-module-oslo-17.4.0/debian/changelog	2020-10-18 14:42:32.000000000 +0000
@@ -1,3 +1,18 @@
+puppet-module-oslo (17.4.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+  * Fixed debian/watch.
+  * Add a debian/salsa-ci.yml.
+
+ -- Thomas Goirand <zigo@debian.org>  Sun, 18 Oct 2020 16:42:32 +0200
+
+puppet-module-oslo (17.4.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed depends for this release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 01 Oct 2020 12:23:37 +0200
+
 puppet-module-oslo (16.3.0-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff -Nru puppet-module-oslo-16.3.0/debian/control puppet-module-oslo-17.4.0/debian/control
--- puppet-module-oslo-16.3.0/debian/control	2020-05-10 09:26:17.000000000 +0000
+++ puppet-module-oslo-17.4.0/debian/control	2020-10-18 14:42:32.000000000 +0000
@@ -19,7 +19,7 @@
 Architecture: all
 Depends:
  puppet,
- puppet-module-openstacklib (>= 16.3.0),
+ puppet-module-openstacklib (>= 17.4.0),
  puppet-module-puppetlabs-inifile,
  puppet-module-puppetlabs-stdlib,
  ${misc:Depends},
diff -Nru puppet-module-oslo-16.3.0/debian/salsa-ci.yml puppet-module-oslo-17.4.0/debian/salsa-ci.yml
--- puppet-module-oslo-16.3.0/debian/salsa-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ puppet-module-oslo-17.4.0/debian/salsa-ci.yml	2020-10-18 14:42:32.000000000 +0000
@@ -0,0 +1,3 @@
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Nru puppet-module-oslo-16.3.0/debian/watch puppet-module-oslo-17.4.0/debian/watch
--- puppet-module-oslo-16.3.0/debian/watch	2020-05-10 09:26:17.000000000 +0000
+++ puppet-module-oslo-17.4.0/debian/watch	2020-10-18 14:42:32.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/puppet-oslo/tags .*/(\d[\d\.]+)\.tar\.gz
+opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \
+https://github.com/openstack/puppet-oslo/tags .*/(\d[brc\d\.]+)\.tar\.gz
diff -Nru puppet-module-oslo-16.3.0/doc/requirements.txt puppet-module-oslo-17.4.0/doc/requirements.txt
--- puppet-module-oslo-16.3.0/doc/requirements.txt	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/doc/requirements.txt	2020-09-24 02:48:54.000000000 +0000
@@ -1,6 +1,6 @@
 # This is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 
 # This is required for the releasenotes build jobs
-reno # Apache-2.0
+reno>=3.1.0 # Apache-2.0
diff -Nru puppet-module-oslo-16.3.0/Gemfile puppet-module-oslo-17.4.0/Gemfile
--- puppet-module-oslo-16.3.0/Gemfile	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/Gemfile	2020-09-24 02:48:54.000000000 +0000
@@ -1,14 +1,23 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test, :system_tests do
-  if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
-    gem 'puppet-openstack_spec_helper',
-        :path => '../..',
+  spec_helper_dir = '/home/zuul/src/opendev.org/openstack/puppet-openstack_spec_helper'
+  if File.directory?(spec_helper_dir)
+    if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
+      gem 'puppet-openstack_spec_helper',
+        :path    => '../..',
+        :require => 'false'
+    else
+      gem 'puppet-openstack_spec_helper',
+        :path    => spec_helper_dir,
         :require => 'false'
+    end
   else
+    spec_helper_version = ENV['ZUUL_BRANCH'] || "master"
     gem 'puppet-openstack_spec_helper',
-        :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
-        :require => 'false'
+      :git     => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
+      :ref     => spec_helper_version,
+      :require => 'false'
   end
 end
 
diff -Nru puppet-module-oslo-16.3.0/lib/puppet/provider/oslo_config/ini_setting.rb puppet-module-oslo-17.4.0/lib/puppet/provider/oslo_config/ini_setting.rb
--- puppet-module-oslo-16.3.0/lib/puppet/provider/oslo_config/ini_setting.rb	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/lib/puppet/provider/oslo_config/ini_setting.rb	2020-09-24 02:48:54.000000000 +0000
@@ -3,6 +3,11 @@
   :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
 ) do
 
+  def create
+    super
+    warning('oslo_config is deprecated, and will be removed in a future release')
+  end
+
   def self.file_path
     '/etc/oslo/oslo.conf'
   end
diff -Nru puppet-module-oslo-16.3.0/manifests/cache.pp puppet-module-oslo-17.4.0/manifests/cache.pp
--- puppet-module-oslo-16.3.0/manifests/cache.pp	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/manifests/cache.pp	2020-09-24 02:48:54.000000000 +0000
@@ -162,10 +162,10 @@
         tag    => 'openstack',
       })
     } elsif ($backend =~ /\.memcache/ ) {
-      ensure_resources('package', { 'python-memcache' => {
-        name   => $::oslo::params::python_memcache_package_name,
-        tag    => ['openstack'],
-      }})
+      ensure_packages('python-memcache', {
+        name => $::oslo::params::python_memcache_package_name,
+        tag  => ['openstack'],
+      })
     }
   }
 
diff -Nru puppet-module-oslo-16.3.0/manifests/db.pp puppet-module-oslo-17.4.0/manifests/db.pp
--- puppet-module-oslo-16.3.0/manifests/db.pp	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/manifests/db.pp	2020-09-24 02:48:54.000000000 +0000
@@ -7,6 +7,10 @@
 #
 # === Parameters:
 #
+# [*config*]
+#   (Optional) The resource type used to apply configuration parameters.
+#   Defaults to $name
+#
 # [*config_group*]
 #   (Optional) The configuration group to set the database configuration in.
 #   Some OpenStack services might implement the oslo database options in another
@@ -102,6 +106,11 @@
 #   (Optional) Enable the experimental use of thread pooling for all DB API calls (boolean value)
 #   Defaults to $::os_service_default
 #
+# [*mysql_enable_ndb*]
+#   (Optional) If True, transparently enables support for handling MySQL
+#   Cluster (NDB).
+#   Defaults to $::os_service_default
+#
 # DEPRECATED PARAMETERS
 #
 # [*idle_timeout*]
@@ -113,6 +122,7 @@
 #   Defaults to undef
 #
 define oslo::db(
+  $config                  = $name,
   $config_group            = 'database',
   $sqlite_synchronous      = $::os_service_default,
   $backend                 = $::os_service_default,
@@ -135,6 +145,7 @@
   $db_max_retry_interval   = $::os_service_default,
   $db_max_retries          = $::os_service_default,
   $use_tpool               = $::os_service_default,
+  $mysql_enable_ndb        = $::os_service_default,
   # DEPRCATED PARAMETERS
   $idle_timeout            = $::os_service_default,
   $min_pool_size           = undef,
@@ -150,8 +161,8 @@
     if $manage_backend_package {
       case $connection {
         /^mysql(\+pymysql)?:\/\//: {
-          require '::mysql::bindings'
-          require '::mysql::bindings::python'
+          require 'mysql::bindings'
+          require 'mysql::bindings::python'
           if $connection =~ /^mysql\+pymysql/ {
             $backend_package = $::oslo::params::pymysql_package_name
           } else {
@@ -160,7 +171,7 @@
         }
         /^postgresql(\+psycopg2)?:\/\//: {
           $backend_package = false
-          require '::postgresql::lib::python'
+          require 'postgresql::lib::python'
         }
         /^mongodb:\/\//: {
           $backend_package = $::oslo::params::pymongo_package_name
@@ -211,8 +222,9 @@
     "${config_group}/db_max_retry_interval"   => { value => $db_max_retry_interval },
     "${config_group}/db_max_retries"          => { value => $db_max_retries },
     "${config_group}/use_tpool"               => { value => $use_tpool },
+    "${config_group}/mysql_enable_ndb"        => { value => $mysql_enable_ndb },
   }
 
-  create_resources($name, $database_options)
+  create_resources($config, $database_options)
 
 }
diff -Nru puppet-module-oslo-16.3.0/manifests/messaging/zmq.pp puppet-module-oslo-17.4.0/manifests/messaging/zmq.pp
--- puppet-module-oslo-16.3.0/manifests/messaging/zmq.pp	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/manifests/messaging/zmq.pp	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-# == Define: oslo::messaging::zmq
-#
-# DEPRECATED!
-#
-# Configure ZeroMQ messaging options
-#
-# This resource configures ZeroMQ messaging resources for an OpenStack service.
-# It will manage the [DEFAULT] section in the given config resource.
-#
-# == Parameters
-#
-# [*rpc_cast_timeout*]
-#  (optional) Seconds to wait before a cast expires (TTL).
-#  The default value of -1 specifies an infinite linger
-#  period. The value of 0 specifies no linger period.
-#  Pending messages shall be discarded immediately
-#  when the socket is closed. Only supported by impl_zmq.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_poll_timeout*]
-#  (optional) The default number of seconds that poll should wait.
-#  Poll raises timeout exception when timeout expired.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_bind_address*]
-#  (optional) ZeroMQ bind address.
-#  Should be a wildcard (*), an ethernet interface, or IP.
-#  The "host" option should point or resolve to this address.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_bind_port_retries*]
-#  (optional) Number of retries to find free port number
-#  before fail with ZMQBindError.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_concurrency*]
-#  (optional) Type of concurrency used.
-#  Either "native" or "eventlet".
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_contexts*]
-#  (optional) Number of ZeroMQ contexts.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_host*]
-#  (optional) Name of this node.
-#  Must be a valid hostname, FQDN, or IP address.
-#  Must match "host" option, if running Nova.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_ipc_dir*]
-#  (optional) Directory for holding IPC sockets.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_matchmaker*]
-#  (optional) MatchMaker driver.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_max_port*]
-#  (optional) Maximal port number for random ports range.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_min_port*]
-#  (optional) Minimal port number for random ports range.
-#  Defaults to $::os_service_default.
-#
-# [*rpc_zmq_topic_backlog*]
-#  (optional) Maximum number of ingress messages to locally buffer per topic.
-#  Defaults to $::os_service_default.
-#
-# [*use_pub_sub*]
-#  (optional) Use PUB/SUB pattern for fanout methods.
-#  PUB/SUB always uses proxy.
-#  Defaults to $::os_service_default.
-#
-# [*zmq_target_expire*]
-#  (optional) Expiration timeout in seconds of a name service
-#  record about existing target ( < 0 means no timeout).
-#  Defaults to $::os_service_default.
-#
-define oslo::messaging::zmq(
-  $rpc_cast_timeout          = $::os_service_default,
-  $rpc_poll_timeout          = $::os_service_default,
-  $rpc_zmq_bind_address      = $::os_service_default,
-  $rpc_zmq_bind_port_retries = $::os_service_default,
-  $rpc_zmq_concurrency       = $::os_service_default,
-  $rpc_zmq_contexts          = $::os_service_default,
-  $rpc_zmq_host              = $::os_service_default,
-  $rpc_zmq_ipc_dir           = $::os_service_default,
-  $rpc_zmq_matchmaker        = $::os_service_default,
-  $rpc_zmq_max_port          = $::os_service_default,
-  $rpc_zmq_min_port          = $::os_service_default,
-  $rpc_zmq_topic_backlog     = $::os_service_default,
-  $use_pub_sub               = $::os_service_default,
-  $zmq_target_expire         = $::os_service_default,
-) {
-
-  warning('oslo::messaging::zmq is deprecated and has no effect since zeromq support in oslo.messaging is removed')
-}
diff -Nru puppet-module-oslo-16.3.0/manifests/releasenotes/notes/rabbitmq-connection-params-1a8ace0c23e7249e.yaml puppet-module-oslo-17.4.0/manifests/releasenotes/notes/rabbitmq-connection-params-1a8ace0c23e7249e.yaml
--- puppet-module-oslo-16.3.0/manifests/releasenotes/notes/rabbitmq-connection-params-1a8ace0c23e7249e.yaml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/manifests/releasenotes/notes/rabbitmq-connection-params-1a8ace0c23e7249e.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
----
-deprecations:
-  - The rabbitmq connection paramters have been deprecated in favor of
-    transport_url which is provided by the oslo::messaging::default class.
-    This affects, rabbit_host, rabbit_port, rabbit_hosts, rabbit_userid,
-    rabbit_password and rabbit_virtual_host.
diff -Nru puppet-module-oslo-16.3.0/metadata.json puppet-module-oslo-17.4.0/metadata.json
--- puppet-module-oslo-16.3.0/metadata.json	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/metadata.json	2020-09-24 02:48:54.000000000 +0000
@@ -11,7 +11,7 @@
         },
         {
             "name": "openstack/openstacklib",
-            "version_requirement": ">=16.3.0 <17.0.0"
+            "version_requirement": ">=17.4.0 <18.0.0"
         }
     ],
     "description": "Installs and configures OpenStack Oslo.",
@@ -22,7 +22,7 @@
         {
             "operatingsystem": "Debian",
             "operatingsystemrelease": [
-                "9"
+                "10"
             ]
         },
         {
@@ -54,10 +54,10 @@
     "requirements": [
         {
             "name": "puppet",
-            "version_requirement": ">= 5.0.0 < 7.0.0"
+            "version_requirement": ">= 6.0.0 < 7.0.0"
         }
     ],
     "source": "git://github.com/openstack/puppet-oslo.git",
     "summary": "Puppet module for OpenStack Oslo",
-    "version": "16.3.0"
+    "version": "17.4.0"
 }
diff -Nru puppet-module-oslo-16.3.0/README.md puppet-module-oslo-17.4.0/README.md
--- puppet-module-oslo-16.3.0/README.md	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/README.md	2020-09-24 02:48:54.000000000 +0000
@@ -15,11 +15,10 @@
 3. [Setup - The basics of getting started with oslo](#setup)
 4. [Implementation - An under-the-hood peek at what the module is doing](#implementation)
 5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Beaker-Rspec - Beaker-rspec tests for the project](#beaker-rpsec)
-7. [Development - Guide for contributing to the module](#development)
-8. [Contributors - Those with commits](#contributors)
-9. [Release Notes - Release notes for the project](#release-notes)
-10. [Repository - The project source code repository](#repository)
+6. [Development - Guide for contributing to the module](#development)
+7. [Contributors - Those with commits](#contributors)
+8. [Release Notes - Release notes for the project](#release-notes)
+9. [Repository - The project source code repository](#repository)
 
 Overview
 --------
@@ -85,22 +84,6 @@
 
 * All the oslo types use the CLI tools and so need to be ran on the oslo node.
 
-Beaker-Rspec
-------------
-
-This module has beaker-rspec tests
-
-To run the tests on the default vagrant node:
-
-```shell
-bundle install
-bundle exec rake acceptance
-```
-
-For more information on writing and running beaker-rspec tests visit the documentation:
-
-* https://github.com/puppetlabs/beaker-rspec/blob/master/README.md
-
 Development
 -----------
 
diff -Nru puppet-module-oslo-16.3.0/releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml puppet-module-oslo-17.4.0/releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml
--- puppet-module-oslo-16.3.0/releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml	1970-01-01 00:00:00.000000000 +0000
+++ puppet-module-oslo-17.4.0/releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml	2020-09-24 02:48:54.000000000 +0000
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add mysql_enable_ndb parameter to select mysql storage engine.
diff -Nru puppet-module-oslo-16.3.0/releasenotes/notes/deprecate-oslo_config-fcd5be0a4c358ba3.yaml puppet-module-oslo-17.4.0/releasenotes/notes/deprecate-oslo_config-fcd5be0a4c358ba3.yaml
--- puppet-module-oslo-16.3.0/releasenotes/notes/deprecate-oslo_config-fcd5be0a4c358ba3.yaml	1970-01-01 00:00:00.000000000 +0000
+++ puppet-module-oslo-17.4.0/releasenotes/notes/deprecate-oslo_config-fcd5be0a4c358ba3.yaml	2020-09-24 02:48:54.000000000 +0000
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``oslo_config`` resource has been deprecated and will be removed in a
+    future release.
diff -Nru puppet-module-oslo-16.3.0/releasenotes/notes/remove-zeromq-826ce00eea673739.yaml puppet-module-oslo-17.4.0/releasenotes/notes/remove-zeromq-826ce00eea673739.yaml
--- puppet-module-oslo-16.3.0/releasenotes/notes/remove-zeromq-826ce00eea673739.yaml	1970-01-01 00:00:00.000000000 +0000
+++ puppet-module-oslo-17.4.0/releasenotes/notes/remove-zeromq-826ce00eea673739.yaml	2020-09-24 02:48:54.000000000 +0000
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - |
+    The deprecated support for ZeroMQ has been removed.
diff -Nru puppet-module-oslo-16.3.0/releasenotes/source/conf.py puppet-module-oslo-17.4.0/releasenotes/source/conf.py
--- puppet-module-oslo-16.3.0/releasenotes/source/conf.py	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/releasenotes/source/conf.py	2020-09-24 02:48:54.000000000 +0000
@@ -86,7 +86,7 @@
 #show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
@@ -250,6 +250,7 @@
 locale_dirs = ['locale/']
 
 # openstackdocstheme options
-repository_name = 'openstack/puppet-oslo'
-bug_project = 'puppet-oslo'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/puppet-oslo'
+openstackdocs_bug_project = 'puppet-oslo'
+openstackdocs_bug_tag = ''
+openstackdocs_auto_name = False
diff -Nru puppet-module-oslo-16.3.0/releasenotes/source/index.rst puppet-module-oslo-17.4.0/releasenotes/source/index.rst
--- puppet-module-oslo-16.3.0/releasenotes/source/index.rst	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/releasenotes/source/index.rst	2020-09-24 02:48:54.000000000 +0000
@@ -9,6 +9,7 @@
    :maxdepth: 2
 
    unreleased
+   ussuri
    train
    stein
    rocky
diff -Nru puppet-module-oslo-16.3.0/releasenotes/source/ussuri.rst puppet-module-oslo-17.4.0/releasenotes/source/ussuri.rst
--- puppet-module-oslo-16.3.0/releasenotes/source/ussuri.rst	1970-01-01 00:00:00.000000000 +0000
+++ puppet-module-oslo-17.4.0/releasenotes/source/ussuri.rst	2020-09-24 02:48:54.000000000 +0000
@@ -0,0 +1,6 @@
+===========================
+Ussuri Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/ussuri
diff -Nru puppet-module-oslo-16.3.0/spec/acceptance/nodesets/centos-70-x64.yml puppet-module-oslo-17.4.0/spec/acceptance/nodesets/centos-70-x64.yml
--- puppet-module-oslo-16.3.0/spec/acceptance/nodesets/centos-70-x64.yml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/acceptance/nodesets/centos-70-x64.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-server-70-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    box: puppetlabs/centos-7.0-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: debug
-  type: foss
diff -Nru puppet-module-oslo-16.3.0/spec/acceptance/nodesets/default.yml puppet-module-oslo-17.4.0/spec/acceptance/nodesets/default.yml
--- puppet-module-oslo-16.3.0/spec/acceptance/nodesets/default.yml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/acceptance/nodesets/default.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  type: foss
diff -Nru puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-bionic.yml puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-bionic.yml
--- puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-bionic.yml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-bionic.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-18.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-18.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff -Nru puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-centos7.yml puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-centos7.yml
--- puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-centos7.yml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-centos7.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-70-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff -Nru puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-trusty.yml puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-trusty.yml
--- puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-trusty.yml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-trusty.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff -Nru puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-xenial.yml puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-xenial.yml
--- puppet-module-oslo-16.3.0/spec/acceptance/nodesets/nodepool-xenial.yml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/acceptance/nodesets/nodepool-xenial.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-16.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-16.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff -Nru puppet-module-oslo-16.3.0/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml puppet-module-oslo-17.4.0/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
--- puppet-module-oslo-16.3.0/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: debug
-  type: foss
diff -Nru puppet-module-oslo-16.3.0/spec/defines/oslo_db_spec.rb puppet-module-oslo-17.4.0/spec/defines/oslo_db_spec.rb
--- puppet-module-oslo-16.3.0/spec/defines/oslo_db_spec.rb	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/defines/oslo_db_spec.rb	2020-09-24 02:48:54.000000000 +0000
@@ -27,6 +27,7 @@
         is_expected.to contain_keystone_config('database/db_max_retry_interval').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('database/db_max_retries').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('database/use_tpool').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_keystone_config('database/mysql_enable_ndb').with_value('<SERVICE DEFAULT>')
       end
     end
 
@@ -51,6 +52,7 @@
           :db_max_retry_interval   => '10',
           :db_max_retries          => '20',
           :use_tpool               => true,
+          :mysql_enable_ndb        => true,
         }
       end
 
@@ -72,6 +74,7 @@
         is_expected.to contain_keystone_config('custom_group/db_max_retry_interval').with_value('10')
         is_expected.to contain_keystone_config('custom_group/db_max_retries').with_value('20')
         is_expected.to contain_keystone_config('custom_group/use_tpool').with_value(true)
+        is_expected.to contain_keystone_config('custom_group/mysql_enable_ndb').with_value(true)
       end
     end
 
diff -Nru puppet-module-oslo-16.3.0/spec/spec_helper_acceptance.rb puppet-module-oslo-17.4.0/spec/spec_helper_acceptance.rb
--- puppet-module-oslo-16.3.0/spec/spec_helper_acceptance.rb	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/spec/spec_helper_acceptance.rb	2020-09-24 02:48:54.000000000 +0000
@@ -1 +1 @@
-require 'puppet-openstack_spec_helper/beaker_spec_helper'
+require 'puppet-openstack_spec_helper/litmus_spec_helper'
diff -Nru puppet-module-oslo-16.3.0/.zuul.yaml puppet-module-oslo-17.4.0/.zuul.yaml
--- puppet-module-oslo-16.3.0/.zuul.yaml	2020-04-24 06:23:10.000000000 +0000
+++ puppet-module-oslo-17.4.0/.zuul.yaml	2020-09-24 02:48:54.000000000 +0000
@@ -3,5 +3,11 @@
       - puppet-openstack-check-jobs
       - puppet-openstack-module-unit-jobs
       - puppet-openstack-integration-jobs-all
-      - puppet-openstack-beaker-jobs
       - release-notes-jobs-python3
+    check:
+      jobs:
+        - tripleo-ci-centos-8-standalone
+    gate:
+      jobs:
+        - tripleo-ci-centos-8-standalone
+      queue: tripleo