diff --git a/.zuul.yaml b/.zuul.yaml
deleted file mode 100644
index 1af0844d7..000000000
--- a/.zuul.yaml
+++ /dev/null
@@ -1,941 +0,0 @@
-- job:
-    name: puppet-openstack-base
-    pre-run: playbooks/prepare-node-common.yaml
-    abstract: true
-    nodeset: ubuntu-bionic
-    vars:
-      use_puppetlabs: false
-
-- job:
-    name: puppet-openstack-integration-base
-    abstract: true
-    parent: puppet-openstack-base
-    required-projects:
-      - openstack/openstack
-      - openstack/puppet-aodh
-      - openstack/puppet-barbican
-      - openstack/puppet-ceilometer
-      - openstack/puppet-ceph
-      - openstack/puppet-cinder
-      - openstack/puppet-cloudkitty
-      - openstack/puppet-congress
-      - openstack/puppet-designate
-      - openstack/puppet-ec2api
-      - openstack/puppet-glance
-      - openstack/puppet-gnocchi
-      - openstack/puppet-heat
-      - openstack/puppet-horizon
-      - openstack/puppet-ironic
-      - openstack/puppet-keystone
-      - openstack/puppet-manila
-      - openstack/puppet-mistral
-      - openstack/puppet-monasca
-      - openstack/puppet-modulesync-configs
-      - openstack/puppet-murano
-      - openstack/puppet-neutron
-      - openstack/puppet-nova
-      - openstack/puppet-octavia
-      - openstack/puppet-openstack-cookiecutter
-      - openstack/puppet-openstack-integration
-      - openstack/puppet-openstack_extras
-      - openstack/puppet-openstacklib
-      - openstack/puppet-oslo
-      - openstack/puppet-ovn
-      - openstack/puppet-panko
-      - openstack/puppet-qdr
-      - openstack/puppet-sahara
-      - openstack/puppet-swift
-      - openstack/puppet-tacker
-      - openstack/puppet-tempest
-      - openstack/puppet-trove
-      - openstack/puppet-vswitch
-      - openstack/puppet-vitrage
-      - openstack/puppet-watcher
-      - openstack/puppet-zaqar
-      - openstack/tempest
-      - openstack/tempest-horizon
-
-- job:
-    name: puppet-openstack-integration-run-base
-    parent: puppet-openstack-integration-base
-    abstract: true
-    pre-run: playbooks/prepare-node-integration.yaml
-    run: playbooks/run-integration-tests.yaml
-    post-run: playbooks/upload-logs.yaml
-    timeout: 7200
-    irrelevant-files:
-      - ^.*\.md$
-      - ^doc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^spec/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-    roles:
-      - zuul: openstack-infra/zuul-jobs
-    # NOTE(tobasco): The ceph variable must be provided with a default here
-    # or zuul will complain when it tries to render the run-integration-tests template.
-    vars:
-      ceph: luminous
-
-- job:
-    name: puppet-openstack-integration-4
-    parent: puppet-openstack-integration-run-base
-    abstract: true
-    vars:
-      puppet: 4
-
-- job:
-    name: puppet-openstack-integration-4-scenario001
-    parent: puppet-openstack-integration-4
-    abstract: true
-    vars:
-      scenario: scenario001
-      ceph: luminous
-
-- job:
-    name: puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
-    parent: puppet-openstack-integration-4-scenario001
-    branches: ^stable/(newton|ocata|pike|queens).*$
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-4-scenario001
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-4-scenario002
-    parent: puppet-openstack-integration-4
-    abstract: true
-    vars:
-      scenario: scenario002
-
-- job:
-    name: puppet-openstack-integration-4-scenario002-tempest-centos-7
-    parent: puppet-openstack-integration-4-scenario002
-    branches: ^stable/(newton|ocata|pike|queens).*$
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-4-scenario002-tempest-debian-stable
-    parent: puppet-openstack-integration-4-scenario002
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-4-scenario003
-    parent: puppet-openstack-integration-4
-    abstract: true
-    vars:
-      scenario: scenario003
-
-- job:
-    name: puppet-openstack-integration-4-scenario003-tempest-centos-7
-    parent: puppet-openstack-integration-4-scenario003
-    branches: ^stable/(newton|ocata|pike|queens).*$
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-4-scenario003-tempest-debian-stable
-    parent: puppet-openstack-integration-4-scenario003
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-4-scenario004
-    parent: puppet-openstack-integration-4
-    abstract: true
-    vars:
-      scenario: scenario004
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
-    parent: puppet-openstack-integration-4-scenario004
-    branches: ^(stable/(ocata|pike|queens)).*$
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-4-scenario004
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    nodeset: debian-stable
-    vars:
-      ceph: luminous
-
-- job:
-    name: puppet-openstack-integration-5
-    parent: puppet-openstack-integration-run-base
-    abstract: true
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    vars:
-      puppet: 5
-
-- job:
-    name: puppet-openstack-integration-5-scenario001
-    parent: puppet-openstack-integration-5
-    abstract: true
-    vars:
-      scenario: scenario001
-      ceph: luminous
-
-- job:
-    name: puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-    parent: puppet-openstack-integration-5-scenario001
-    nodeset: ubuntu-bionic
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
-    parent: puppet-openstack-integration-5-scenario001
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-5-scenario001
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-5-scenario002
-    parent: puppet-openstack-integration-5
-    abstract: true
-    vars:
-      scenario: scenario002
-
-- job:
-    name: puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-    parent: puppet-openstack-integration-5-scenario002
-    nodeset: ubuntu-bionic
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario002-tempest-centos-7
-    parent: puppet-openstack-integration-5-scenario002
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-5-scenario002-tempest-debian-stable
-    parent: puppet-openstack-integration-5-scenario002
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-5-scenario003
-    parent: puppet-openstack-integration-5
-    abstract: true
-    vars:
-      scenario: scenario003
-
-- job:
-    name: puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
-    parent: puppet-openstack-integration-5-scenario003
-    nodeset: ubuntu-bionic
-    voting: false
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario003-tempest-centos-7
-    parent: puppet-openstack-integration-5-scenario003
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-5-scenario003-tempest-debian-stable
-    parent: puppet-openstack-integration-5-scenario003
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-5-scenario004
-    parent: puppet-openstack-integration-5
-    branches: ^(?!stable/newton).*$
-    abstract: true
-    vars:
-      scenario: scenario004
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-    parent: puppet-openstack-integration-5-scenario004
-    nodeset: ubuntu-bionic
-    voting: false
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-    parent: puppet-openstack-integration-5-scenario004
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-5-scenario004
-    nodeset: debian-stable
-    vars:
-      ceph: luminous
-
-- job:
-    name: puppet-openstack-integration-6
-    parent: puppet-openstack-integration-run-base
-    abstract: true
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    vars:
-      puppet: 6
-
-- job:
-    name: puppet-openstack-integration-6-scenario001
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario001
-      ceph: luminous
-
-- job:
-    name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-    parent: puppet-openstack-integration-6-scenario001
-    nodeset: ubuntu-bionic
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
-    parent: puppet-openstack-integration-6-scenario001
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-6-scenario001
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-6-scenario002
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario002
-
-- job:
-    name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-    parent: puppet-openstack-integration-6-scenario002
-    nodeset: ubuntu-bionic
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-6-scenario002-tempest-centos-7
-    parent: puppet-openstack-integration-6-scenario002
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-6-scenario002-tempest-debian-stable
-    parent: puppet-openstack-integration-6-scenario002
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-6-scenario003
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario003
-
-- job:
-    name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
-    parent: puppet-openstack-integration-6-scenario003
-    nodeset: ubuntu-bionic
-    voting: false
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-6-scenario003-tempest-centos-7
-    parent: puppet-openstack-integration-6-scenario003
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-6-scenario003-tempest-debian-stable
-    parent: puppet-openstack-integration-6-scenario003
-    nodeset: debian-stable
-
-- job:
-    name: puppet-openstack-integration-6-scenario004
-    parent: puppet-openstack-integration-6
-    branches: ^(?!stable/newton).*$
-    abstract: true
-    vars:
-      scenario: scenario004
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
-    parent: puppet-openstack-integration-6-scenario004
-    nodeset: ubuntu-bionic
-    voting: false
-    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
-
-- job:
-    name: puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
-    parent: puppet-openstack-integration-6-scenario004
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
-    parent: puppet-openstack-integration-6-scenario004
-    nodeset: debian-stable
-    vars:
-      ceph: luminous
-
-- project-template:
-    name: puppet-openstack-integration-jobs-all
-    check:
-      jobs:
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-5-scenario002-tempest-centos-7
-        - puppet-openstack-integration-5-scenario003-tempest-centos-7
-        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
-            voting: false
-        - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
-            voting: false
-        - puppet-openstack-integration-4-scenario003-tempest-debian-stable:
-            voting: false
-        - puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
-            voting: false
-    gate:
-      jobs:
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-5-scenario002-tempest-centos-7
-        - puppet-openstack-integration-5-scenario003-tempest-centos-7
-        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
-        - puppet-openstack-integration-5-scenario002-tempest-debian-stable
-        - puppet-openstack-integration-5-scenario003-tempest-debian-stable
-        - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
-
-- project-template:
-    name: puppet-openstack-integration-jobs-scenario001
-    check:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
-            voting: false
-    gate:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
-
-- project-template:
-    name: puppet-openstack-integration-jobs-scenario002
-    check:
-      jobs:
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
-        - puppet-openstack-integration-5-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
-        - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
-            voting: false
-    gate:
-      jobs:
-        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
-        - puppet-openstack-integration-4-scenario002-tempest-centos-7
-        - puppet-openstack-integration-5-scenario002-tempest-centos-7
-        - puppet-openstack-integration-6-scenario002-tempest-centos-7
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario002-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
-
-- project-template:
-    name: puppet-openstack-integration-jobs-scenario003
-    check:
-      jobs:
-        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
-        - puppet-openstack-integration-5-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
-        - puppet-openstack-integration-4-scenario003-tempest-debian-stable:
-            voting: false
-    gate:
-      jobs:
-        - puppet-openstack-integration-4-scenario003-tempest-centos-7
-        - puppet-openstack-integration-5-scenario003-tempest-centos-7
-        - puppet-openstack-integration-6-scenario003-tempest-centos-7
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario003-tempest-debian-stable
-        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
-
-- project-template:
-    name: puppet-openstack-integration-jobs-scenario004
-    check:
-      jobs:
-        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
-            voting: false
-    gate:
-      jobs:
-        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
-        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
-    experimental:
-      jobs:
-        - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
-        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
-
-- job:
-    name: puppet-openstack-module-base
-    parent: puppet-openstack-base
-    pre-run: playbooks/prepare-node-unit.yaml
-
-- job:
-    name: puppet-openstack-lint
-    parent: puppet-openstack-module-base
-    run: playbooks/run-lint-tests.yaml
-    irrelevant-files:
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^releasenotes/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-
-- job:
-    name: puppet-openstack-syntax-base
-    parent: puppet-openstack-module-base
-    run: playbooks/run-syntax-tests.yaml
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-
-- job:
-    name: puppet-openstack-syntax-4
-    parent: puppet-openstack-syntax-base
-    vars:
-      puppet: 4
-
-- job:
-    name: puppet-openstack-syntax-5
-    parent: puppet-openstack-syntax-base
-    vars:
-      puppet: 5
-
-- job:
-    name: puppet-openstack-syntax-6
-    parent: puppet-openstack-syntax-base
-    vars:
-      puppet: 6
-
-- job:
-    name: puppet-openstack-unit-base
-    parent: puppet-openstack-integration-base
-    run: playbooks/run-unit-tests.yaml
-    pre-run: playbooks/prepare-node-unit.yaml
-    timeout: 3600
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-      - ^spec/acceptance/.*$
-      - ^LICENSE$
-      - ^.gitignore$
-
-- job:
-    name: puppet-openstack-unit-4.8-centos-7
-    parent: puppet-openstack-unit-base
-    nodeset: centos-7
-    vars:
-      puppet_gem_version: 4.8
-
-- job:
-    name: puppet-openstack-unit-5.5-centos-7
-    parent: puppet-openstack-unit-base
-    nodeset: centos-7
-    vars:
-      puppet_gem_version: 5.5
-
-- job:
-    name: puppet-openstack-unit-6.0-ubuntu-bionic
-    parent: puppet-openstack-unit-base
-    nodeset: ubuntu-bionic
-    branches: ^master
-    vars:
-      puppet_gem_version: 6.0
-
-- job:
-    name: puppet-openstack-unit-latest-ubuntu-bionic
-    parent: puppet-openstack-unit-base
-    nodeset: ubuntu-bionic
-    branches: ^master
-    voting: false
-    vars:
-      puppet_gem_version: latest
-
-- project-template:
-    name: puppet-openstack-module-unit-jobs
-    check:
-      jobs:
-        - puppet-openstack-unit-4.8-centos-7
-        - puppet-openstack-unit-5.5-centos-7
-        - puppet-openstack-unit-6.0-ubuntu-bionic
-        - puppet-openstack-unit-latest-ubuntu-bionic
-    gate:
-      jobs:
-        - puppet-openstack-unit-4.8-centos-7
-        - puppet-openstack-unit-5.5-centos-7
-        - puppet-openstack-unit-6.0-ubuntu-bionic
-
-- project-template:
-    name: puppet-openstack-check-jobs
-    check:
-      jobs:
-        - puppet-openstack-lint
-        - puppet-openstack-syntax-4
-        - puppet-openstack-syntax-5
-        - puppet-openstack-syntax-6
-    gate:
-      jobs:
-        - puppet-openstack-lint
-        - puppet-openstack-syntax-4
-        - puppet-openstack-syntax-5
-        - puppet-openstack-syntax-6
-
-- project:
-    templates:
-      - puppet-openstack-check-jobs
-      - puppet-openstack-integration-jobs-all
-
-- job:
-    name: puppet-openstack-beaker-run-base
-    parent: puppet-openstack-integration-base
-    abstract: true
-    pre-run: playbooks/prepare-node-beaker.yaml
-    post-run: playbooks/upload-logs.yaml
-    run: playbooks/run-beaker-tests.yaml
-    timeout: 5400
-    irrelevant-files:
-      - ^.*\.md$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-      - ^spec/unit/.*$
-      - ^spec/classes/.*$
-      - ^spec/defines/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-      - ^metadata.json$
-      - ^LICENSE$
-      - ^.gitignore$
-
-- job:
-    name: puppet-openstack-beaker-centos-7
-    parent: puppet-openstack-beaker-run-base
-    nodeset: centos-7
-    vars:
-      nodepool_type: centos7
-
-- job:
-    name: puppet-openstack-beaker-ubuntu-bionic
-    parent: puppet-openstack-beaker-run-base
-    nodeset: ubuntu-bionic
-    vars:
-      nodepool_type: bionic
-
-- project-template:
-    name: puppet-openstack-beaker-jobs
-    check:
-      jobs:
-        - puppet-openstack-beaker-centos-7
-        - puppet-openstack-beaker-ubuntu-bionic
-    gate:
-      jobs:
-        - puppet-openstack-beaker-centos-7
-        - puppet-openstack-beaker-ubuntu-bionic
-
-- job:
-    name: puppet-openstack-libraries-puppet-beaker-rspec-centos-7
-    parent: puppet-openstack-integration-base
-    pre-run: playbooks/prepare-node-beaker.yaml
-    post-run: playbooks/upload-logs.yaml
-    run: playbooks/run-libraries-beaker-tests.yaml
-    timeout: 3600
-    nodeset: centos-7
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-    vars:
-      nodepool_type: centos7
-
-- job:
-    name: puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
-    parent: puppet-openstack-integration-base
-    pre-run: playbooks/prepare-node-beaker.yaml
-    post-run: playbooks/upload-logs.yaml
-    run: playbooks/run-libraries-beaker-tests.yaml
-    timeout: 3600
-    nodeset: ubuntu-bionic
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-    vars:
-      nodepool_type: bionic
-
-- job:
-    name: puppet-openstack-libraries-puppet-lint-centos-7
-    parent: puppet-openstack-integration-base
-    run: playbooks/run-libraries-lint-tests.yaml
-    pre-run: playbooks/prepare-node-unit.yaml
-    timeout: 3600
-    nodeset: centos-7
-
-- job:
-    name: puppet-openstack-libraries-puppet-syntax
-    parent: puppet-openstack-integration-base
-    run: playbooks/run-libraries-syntax-tests.yaml
-    pre-run: playbooks/prepare-node-unit.yaml
-    timeout: 3600
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-
-- job:
-    name: puppet-openstack-libraries-puppet-syntax-4-centos-7
-    parent: puppet-openstack-libraries-puppet-syntax
-    nodeset: centos-7
-    vars:
-      puppet: 4
-
-- job:
-    name: puppet-openstack-libraries-puppet-syntax-5-centos-7
-    parent: puppet-openstack-libraries-puppet-syntax
-    nodeset: centos-7
-    vars:
-      puppet: 5
-
-- job:
-    name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
-    parent: puppet-openstack-libraries-puppet-syntax
-    nodeset: ubuntu-bionic
-    vars:
-      puppet: 6
-
-- job:
-    name: puppet-openstack-libraries-puppet-unit-base
-    parent: puppet-openstack-integration-base
-    run: playbooks/run-libraries-unit-tests.yaml
-    pre-run: playbooks/prepare-node-unit.yaml
-    timeout: 3600
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-
-- job:
-    name: puppet-openstack-libraries-puppet-unit-4.8-centos-7
-    parent: puppet-openstack-libraries-puppet-unit-base
-    nodeset: centos-7
-    vars:
-      puppet_gem_version: 4.8
-
-- job:
-    name: puppet-openstack-libraries-puppet-unit-5.5-centos-7
-    parent: puppet-openstack-libraries-puppet-unit-base
-    nodeset: centos-7
-    vars:
-      puppet_gem_version: 5.5
-
-- job:
-    name: puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
-    parent: puppet-openstack-libraries-puppet-unit-base
-    branches: ^master
-    nodeset: ubuntu-bionic
-    vars:
-      puppet_gem_version: 6.0
-
-- job:
-    name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
-    parent: puppet-openstack-libraries-puppet-unit-base
-    branches: ^master
-    nodeset: ubuntu-bionic
-    voting: false
-    vars:
-      puppet_gem_version: latest
-
-- job:
-    name: tripleo-puppet-ci-centos-7-undercloud-containers
-    parent: tripleo-ci-centos-7-undercloud-containers
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-
-- project-template:
-    name: tripleo-puppet-undercloud
-    check:
-      jobs:
-        - tripleo-puppet-ci-centos-7-undercloud-containers
-    gate:
-      jobs:
-        - tripleo-puppet-ci-centos-7-undercloud-containers
-
-- job:
-    name: tripleo-puppet-ci-centos-7-standalone
-    parent: tripleo-ci-centos-7-standalone
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-
-- project-template:
-    name: tripleo-puppet-standalone
-    check:
-      jobs:
-        - tripleo-puppet-ci-centos-7-standalone
-    gate:
-      jobs:
-        - tripleo-puppet-ci-centos-7-standalone
-
-- project-template:
-    name: puppet-openstack-library-jobs
-    check:
-      jobs:
-        - puppet-openstack-libraries-puppet-lint-centos-7
-        - puppet-openstack-libraries-puppet-syntax-4-centos-7
-        - puppet-openstack-libraries-puppet-syntax-5-centos-7
-        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
-        - puppet-openstack-libraries-puppet-unit-5.5-centos-7
-        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
-        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
-    gate:
-      jobs:
-        - puppet-openstack-libraries-puppet-lint-centos-7
-        - puppet-openstack-libraries-puppet-syntax-4-centos-7
-        - puppet-openstack-libraries-puppet-syntax-5-centos-7
-        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
-        - puppet-openstack-libraries-puppet-unit-5.5-centos-7
-        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
-        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
new file mode 100644
index 000000000..d23a7aa05
--- /dev/null
+++ b/zuul.d/base.yaml
@@ -0,0 +1,186 @@
+
+- job:
+    name: puppet-openstack-integration-base
+    abstract: true
+    parent: puppet-openstack-base
+    required-projects:
+      - openstack/openstack
+      - openstack/puppet-aodh
+      - openstack/puppet-barbican
+      - openstack/puppet-ceilometer
+      - openstack/puppet-ceph
+      - openstack/puppet-cinder
+      - openstack/puppet-cloudkitty
+      - openstack/puppet-congress
+      - openstack/puppet-designate
+      - openstack/puppet-ec2api
+      - openstack/puppet-glance
+      - openstack/puppet-gnocchi
+      - openstack/puppet-heat
+      - openstack/puppet-horizon
+      - openstack/puppet-ironic
+      - openstack/puppet-keystone
+      - openstack/puppet-manila
+      - openstack/puppet-mistral
+      - openstack/puppet-monasca
+      - openstack/puppet-modulesync-configs
+      - openstack/puppet-murano
+      - openstack/puppet-neutron
+      - openstack/puppet-nova
+      - openstack/puppet-octavia
+      - openstack/puppet-openstack-cookiecutter
+      - openstack/puppet-openstack-integration
+      - openstack/puppet-openstack_extras
+      - openstack/puppet-openstacklib
+      - openstack/puppet-oslo
+      - openstack/puppet-ovn
+      - openstack/puppet-panko
+      - openstack/puppet-qdr
+      - openstack/puppet-sahara
+      - openstack/puppet-swift
+      - openstack/puppet-tacker
+      - openstack/puppet-tempest
+      - openstack/puppet-trove
+      - openstack/puppet-vswitch
+      - openstack/puppet-vitrage
+      - openstack/puppet-watcher
+      - openstack/puppet-zaqar
+      - openstack/tempest
+      - openstack/tempest-horizon
+
+- job:
+    name: puppet-openstack-integration-run-base
+    parent: puppet-openstack-integration-base
+    abstract: true
+    pre-run: playbooks/prepare-node-integration.yaml
+    run: playbooks/run-integration-tests.yaml
+    post-run: playbooks/upload-logs.yaml
+    timeout: 7200
+    irrelevant-files:
+      - ^.*\.md$
+      - ^doc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^spec/.*$
+      - ^requirements.txt$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+      - ^setup.cfg$
+      - ^setup.py$
+    roles:
+      - zuul: openstack-infra/zuul-jobs
+    # NOTE(tobasco): The ceph variable must be provided with a default here
+    # or zuul will complain when it tries to render the run-integration-tests template.
+    vars:
+      ceph: luminous
+
+- job:
+    name: puppet-openstack-base
+    pre-run: playbooks/prepare-node-common.yaml
+    abstract: true
+    nodeset: ubuntu-bionic
+    vars:
+      use_puppetlabs: false
+
+- job:
+    name: puppet-openstack-module-base
+    parent: puppet-openstack-base
+    pre-run: playbooks/prepare-node-unit.yaml
+
+
+- job:
+    name: puppet-openstack-syntax-base
+    parent: puppet-openstack-module-base
+    run: playbooks/run-syntax-tests.yaml
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^requirements.txt$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+      - ^setup.cfg$
+      - ^setup.py$
+
+- job:
+    name: puppet-openstack-unit-base
+    parent: puppet-openstack-integration-base
+    run: playbooks/run-unit-tests.yaml
+    pre-run: playbooks/prepare-node-unit.yaml
+    timeout: 3600
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^requirements.txt$
+      - ^test-requirements.txt$
+      - ^spec/acceptance/.*$
+      - ^LICENSE$
+      - ^.gitignore$
+      - ^setup.cfg$
+      - ^setup.py$
+
+- job:
+    name: puppet-openstack-libraries-puppet-unit-base
+    parent: puppet-openstack-integration-base
+    run: playbooks/run-libraries-unit-tests.yaml
+    pre-run: playbooks/prepare-node-unit.yaml
+    timeout: 3600
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+      - ^setup.cfg$
+      - ^setup.py$
+
+- job:
+    name: puppet-openstack-beaker-run-base
+    parent: puppet-openstack-integration-base
+    abstract: true
+    pre-run: playbooks/prepare-node-beaker.yaml
+    post-run: playbooks/upload-logs.yaml
+    run: playbooks/run-beaker-tests.yaml
+    timeout: 5400
+    irrelevant-files:
+      - ^.*\.md$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+      - ^spec/unit/.*$
+      - ^spec/classes/.*$
+      - ^spec/defines/.*$
+      - ^requirements.txt$
+      - ^test-requirements.txt$
+      - ^metadata.json$
+      - ^LICENSE$
+      - ^.gitignore$
+      - ^setup.cfg$
+      - ^setup.py$
+
+- job:
+    name: puppet-openstack-beaker-centos-7
+    parent: puppet-openstack-beaker-run-base
+    nodeset: centos-7
+    vars:
+      nodepool_type: centos7
+
+- job:
+    name: puppet-openstack-beaker-ubuntu-bionic
+    parent: puppet-openstack-beaker-run-base
+    nodeset: ubuntu-bionic
+    vars:
+      nodepool_type: bionic
+
diff --git a/zuul.d/beaker.yaml b/zuul.d/beaker.yaml
new file mode 100644
index 000000000..29ec644a1
--- /dev/null
+++ b/zuul.d/beaker.yaml
@@ -0,0 +1,55 @@
+
+- project-template:
+    name: puppet-openstack-beaker-jobs
+    check:
+      jobs:
+        - puppet-openstack-beaker-centos-7
+        - puppet-openstack-beaker-ubuntu-bionic
+    gate:
+      jobs:
+        - puppet-openstack-beaker-centos-7
+        - puppet-openstack-beaker-ubuntu-bionic
+
+- job:
+    name: puppet-openstack-libraries-puppet-beaker-rspec-centos-7
+    parent: puppet-openstack-integration-base
+    pre-run: playbooks/prepare-node-beaker.yaml
+    post-run: playbooks/upload-logs.yaml
+    run: playbooks/run-libraries-beaker-tests.yaml
+    timeout: 3600
+    nodeset: centos-7
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+    vars:
+      nodepool_type: centos7
+
+- job:
+    name: puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
+    parent: puppet-openstack-integration-base
+    pre-run: playbooks/prepare-node-beaker.yaml
+    post-run: playbooks/upload-logs.yaml
+    run: playbooks/run-libraries-beaker-tests.yaml
+    timeout: 3600
+    nodeset: ubuntu-bionic
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+    vars:
+      nodepool_type: bionic
+
+
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
new file mode 100644
index 000000000..3349a5fef
--- /dev/null
+++ b/zuul.d/integration.yaml
@@ -0,0 +1,322 @@
+---
+
+- job:
+    name: puppet-openstack-integration-4
+    parent: puppet-openstack-integration-run-base
+    abstract: true
+    vars:
+      puppet: 4
+
+- job:
+    name: puppet-openstack-integration-4-scenario001
+    parent: puppet-openstack-integration-4
+    abstract: true
+    vars:
+      scenario: scenario001
+      ceph: luminous
+
+- job:
+    name: puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
+    parent: puppet-openstack-integration-4-scenario001
+    branches: ^stable/(newton|ocata|pike|queens).*$
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-4-scenario001
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-4-scenario002
+    parent: puppet-openstack-integration-4
+    abstract: true
+    vars:
+      scenario: scenario002
+
+- job:
+    name: puppet-openstack-integration-4-scenario002-tempest-centos-7
+    parent: puppet-openstack-integration-4-scenario002
+    branches: ^stable/(newton|ocata|pike|queens).*$
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-4-scenario002-tempest-debian-stable
+    parent: puppet-openstack-integration-4-scenario002
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-4-scenario003
+    parent: puppet-openstack-integration-4
+    abstract: true
+    vars:
+      scenario: scenario003
+
+- job:
+    name: puppet-openstack-integration-4-scenario003-tempest-centos-7
+    parent: puppet-openstack-integration-4-scenario003
+    branches: ^stable/(newton|ocata|pike|queens).*$
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-4-scenario003-tempest-debian-stable
+    parent: puppet-openstack-integration-4-scenario003
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-4-scenario004
+    parent: puppet-openstack-integration-4
+    abstract: true
+    vars:
+      scenario: scenario004
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
+    parent: puppet-openstack-integration-4-scenario004
+    branches: ^(stable/(ocata|pike|queens)).*$
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-4-scenario004
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    nodeset: debian-stable
+    vars:
+      ceph: luminous
+
+- job:
+    name: puppet-openstack-integration-5
+    parent: puppet-openstack-integration-run-base
+    abstract: true
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    vars:
+      puppet: 5
+
+- job:
+    name: puppet-openstack-integration-5-scenario001
+    parent: puppet-openstack-integration-5
+    abstract: true
+    vars:
+      scenario: scenario001
+      ceph: luminous
+
+- job:
+    name: puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
+    parent: puppet-openstack-integration-5-scenario001
+    nodeset: ubuntu-bionic
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
+    parent: puppet-openstack-integration-5-scenario001
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-5-scenario001
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-5-scenario002
+    parent: puppet-openstack-integration-5
+    abstract: true
+    vars:
+      scenario: scenario002
+
+- job:
+    name: puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
+    parent: puppet-openstack-integration-5-scenario002
+    nodeset: ubuntu-bionic
+    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
+    # luminous is not packaged for Bionic repos.pp will fail otherwise.
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-5-scenario002-tempest-centos-7
+    parent: puppet-openstack-integration-5-scenario002
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-5-scenario002-tempest-debian-stable
+    parent: puppet-openstack-integration-5-scenario002
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-5-scenario003
+    parent: puppet-openstack-integration-5
+    abstract: true
+    vars:
+      scenario: scenario003
+
+- job:
+    name: puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
+    parent: puppet-openstack-integration-5-scenario003
+    nodeset: ubuntu-bionic
+    voting: false
+    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
+    # luminous is not packaged for Bionic repos.pp will fail otherwise.
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-5-scenario003-tempest-centos-7
+    parent: puppet-openstack-integration-5-scenario003
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-5-scenario003-tempest-debian-stable
+    parent: puppet-openstack-integration-5-scenario003
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-5-scenario004
+    parent: puppet-openstack-integration-5
+    branches: ^(?!stable/newton).*$
+    abstract: true
+    vars:
+      scenario: scenario004
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
+    parent: puppet-openstack-integration-5-scenario004
+    nodeset: ubuntu-bionic
+    voting: false
+    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
+    # luminous is not packaged for Bionic repos.pp will fail otherwise.
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
+    parent: puppet-openstack-integration-5-scenario004
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-5-scenario004
+    nodeset: debian-stable
+    vars:
+      ceph: luminous
+
+- job:
+    name: puppet-openstack-integration-6
+    parent: puppet-openstack-integration-run-base
+    abstract: true
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    vars:
+      puppet: 6
+
+- job:
+    name: puppet-openstack-integration-6-scenario001
+    parent: puppet-openstack-integration-6
+    abstract: true
+    vars:
+      scenario: scenario001
+      ceph: luminous
+
+- job:
+    name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+    parent: puppet-openstack-integration-6-scenario001
+    nodeset: ubuntu-bionic
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+    parent: puppet-openstack-integration-6-scenario001
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-6-scenario001
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-6-scenario002
+    parent: puppet-openstack-integration-6
+    abstract: true
+    vars:
+      scenario: scenario002
+
+- job:
+    name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+    parent: puppet-openstack-integration-6-scenario002
+    nodeset: ubuntu-bionic
+    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
+    # luminous is not packaged for Bionic repos.pp will fail otherwise.
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-6-scenario002-tempest-centos-7
+    parent: puppet-openstack-integration-6-scenario002
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario002-tempest-debian-stable
+    parent: puppet-openstack-integration-6-scenario002
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-6-scenario003
+    parent: puppet-openstack-integration-6
+    abstract: true
+    vars:
+      scenario: scenario003
+
+- job:
+    name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
+    parent: puppet-openstack-integration-6-scenario003
+    nodeset: ubuntu-bionic
+    voting: false
+    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
+    # luminous is not packaged for Bionic repos.pp will fail otherwise.
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-6-scenario003-tempest-centos-7
+    parent: puppet-openstack-integration-6-scenario003
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario003-tempest-debian-stable
+    parent: puppet-openstack-integration-6-scenario003
+    nodeset: debian-stable
+
+- job:
+    name: puppet-openstack-integration-6-scenario004
+    parent: puppet-openstack-integration-6
+    branches: ^(?!stable/newton).*$
+    abstract: true
+    vars:
+      scenario: scenario004
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+    parent: puppet-openstack-integration-6-scenario004
+    nodeset: ubuntu-bionic
+    voting: false
+    # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
+    # luminous is not packaged for Bionic repos.pp will fail otherwise.
+    vars:
+      ceph: mimic
+
+- job:
+    name: puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+    parent: puppet-openstack-integration-6-scenario004
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
+    parent: puppet-openstack-integration-6-scenario004
+    nodeset: debian-stable
+    vars:
+      ceph: luminous
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
new file mode 100644
index 000000000..c7ca4c33e
--- /dev/null
+++ b/zuul.d/layout.yaml
@@ -0,0 +1,201 @@
+---
+# This file contains the puppet openstack project templates for lint, unit and
+# integration jobs.
+
+# lint jobs
+- project-template:
+    name: puppet-openstack-check-jobs
+    check:
+      jobs:
+        - puppet-openstack-lint
+        - puppet-openstack-syntax-4
+        - puppet-openstack-syntax-5
+        - puppet-openstack-syntax-6
+    gate:
+      jobs:
+        - puppet-openstack-lint
+        - puppet-openstack-syntax-4
+        - puppet-openstack-syntax-5
+        - puppet-openstack-syntax-6
+
+- project:
+    templates:
+      - puppet-openstack-check-jobs
+      - puppet-openstack-integration-jobs-all
+
+# jobs for the puppet openstack library repos
+- project-template:
+    name: puppet-openstack-library-jobs
+    check:
+      jobs:
+        - puppet-openstack-libraries-puppet-lint-centos-7
+        - puppet-openstack-libraries-puppet-syntax-4-centos-7
+        - puppet-openstack-libraries-puppet-syntax-5-centos-7
+        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
+        - puppet-openstack-libraries-puppet-unit-5.5-centos-7
+        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
+        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
+    gate:
+      jobs:
+        - puppet-openstack-libraries-puppet-lint-centos-7
+        - puppet-openstack-libraries-puppet-syntax-4-centos-7
+        - puppet-openstack-libraries-puppet-syntax-5-centos-7
+        - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
+        - puppet-openstack-libraries-puppet-unit-5.5-centos-7
+        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
+        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
+
+# integration jobs
+- project-template:
+    name: puppet-openstack-integration-jobs-all
+    check:
+      jobs:
+        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-4-scenario002-tempest-centos-7
+        - puppet-openstack-integration-4-scenario003-tempest-centos-7
+        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-5-scenario002-tempest-centos-7
+        - puppet-openstack-integration-5-scenario003-tempest-centos-7
+        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
+        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
+            voting: false
+        - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
+            voting: false
+        - puppet-openstack-integration-4-scenario003-tempest-debian-stable:
+            voting: false
+        - puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
+            voting: false
+    gate:
+      jobs:
+        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-4-scenario002-tempest-centos-7
+        - puppet-openstack-integration-4-scenario003-tempest-centos-7
+        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-5-scenario002-tempest-centos-7
+        - puppet-openstack-integration-5-scenario003-tempest-centos-7
+        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+    experimental:
+      jobs:
+        - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
+        - puppet-openstack-integration-5-scenario002-tempest-debian-stable
+        - puppet-openstack-integration-5-scenario003-tempest-debian-stable
+        - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
+
+- project-template:
+    name: puppet-openstack-integration-jobs-scenario001
+    check:
+      jobs:
+        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
+            voting: false
+    gate:
+      jobs:
+        - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous
+    experimental:
+      jobs:
+        - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
+
+- project-template:
+    name: puppet-openstack-integration-jobs-scenario002
+    check:
+      jobs:
+        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-4-scenario002-tempest-centos-7
+        - puppet-openstack-integration-5-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
+        - puppet-openstack-integration-4-scenario002-tempest-debian-stable:
+            voting: false
+    gate:
+      jobs:
+        - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
+        - puppet-openstack-integration-4-scenario002-tempest-centos-7
+        - puppet-openstack-integration-5-scenario002-tempest-centos-7
+        - puppet-openstack-integration-6-scenario002-tempest-centos-7
+    experimental:
+      jobs:
+        - puppet-openstack-integration-5-scenario002-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario002-tempest-debian-stable
+
+- project-template:
+    name: puppet-openstack-integration-jobs-scenario003
+    check:
+      jobs:
+        - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
+        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
+        - puppet-openstack-integration-4-scenario003-tempest-centos-7
+        - puppet-openstack-integration-5-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
+        - puppet-openstack-integration-4-scenario003-tempest-debian-stable:
+            voting: false
+    gate:
+      jobs:
+        - puppet-openstack-integration-4-scenario003-tempest-centos-7
+        - puppet-openstack-integration-5-scenario003-tempest-centos-7
+        - puppet-openstack-integration-6-scenario003-tempest-centos-7
+    experimental:
+      jobs:
+        - puppet-openstack-integration-5-scenario003-tempest-debian-stable
+        - puppet-openstack-integration-6-scenario003-tempest-debian-stable
+
+- project-template:
+    name: puppet-openstack-integration-jobs-scenario004
+    check:
+      jobs:
+        - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
+            voting: false
+    gate:
+      jobs:
+        - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic
+    experimental:
+      jobs:
+        - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
+        - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
new file mode 100644
index 000000000..fcaf2c01e
--- /dev/null
+++ b/zuul.d/libraries.yaml
@@ -0,0 +1,34 @@
+---
+# This file contains the jobs for the puppet openstack libraries
+#
+- job:
+    name: puppet-openstack-libraries-puppet-unit-4.8-centos-7
+    parent: puppet-openstack-libraries-puppet-unit-base
+    nodeset: centos-7
+    vars:
+      puppet_gem_version: 4.8
+
+- job:
+    name: puppet-openstack-libraries-puppet-unit-5.5-centos-7
+    parent: puppet-openstack-libraries-puppet-unit-base
+    nodeset: centos-7
+    vars:
+      puppet_gem_version: 5.5
+
+
+- job:
+    name: puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
+    parent: puppet-openstack-libraries-puppet-unit-base
+    branches: ^master
+    nodeset: ubuntu-bionic
+    vars:
+      puppet_gem_version: 6.0
+
+- job:
+    name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
+    parent: puppet-openstack-libraries-puppet-unit-base
+    branches: ^master
+    nodeset: ubuntu-bionic
+    voting: false
+    vars:
+      puppet_gem_version: latest
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
new file mode 100644
index 000000000..e03e6b2b9
--- /dev/null
+++ b/zuul.d/linters.yaml
@@ -0,0 +1,76 @@
+- job:
+    name: puppet-openstack-lint
+    parent: puppet-openstack-module-base
+    run: playbooks/run-lint-tests.yaml
+    irrelevant-files:
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^requirements.txt$
+      - ^test-requirements.txt$
+
+- job:
+    name: puppet-openstack-syntax-4
+    parent: puppet-openstack-syntax-base
+    vars:
+      puppet: 4
+
+- job:
+    name: puppet-openstack-syntax-5
+    parent: puppet-openstack-syntax-base
+    vars:
+      puppet: 5
+
+- job:
+    name: puppet-openstack-syntax-6
+    parent: puppet-openstack-syntax-base
+    vars:
+      puppet: 6
+
+- job:
+    name: puppet-openstack-libraries-puppet-lint-centos-7
+    parent: puppet-openstack-integration-base
+    run: playbooks/run-libraries-lint-tests.yaml
+    pre-run: playbooks/prepare-node-unit.yaml
+    timeout: 3600
+    nodeset: centos-7
+
+- job:
+    name: puppet-openstack-libraries-puppet-syntax
+    parent: puppet-openstack-integration-base
+    run: playbooks/run-libraries-syntax-tests.yaml
+    pre-run: playbooks/prepare-node-unit.yaml
+    timeout: 3600
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-4-centos-7
+    parent: puppet-openstack-libraries-puppet-syntax
+    nodeset: centos-7
+    vars:
+      puppet: 4
+
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-5-centos-7
+    parent: puppet-openstack-libraries-puppet-syntax
+    nodeset: centos-7
+    vars:
+      puppet: 5
+
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
+    parent: puppet-openstack-libraries-puppet-syntax
+    nodeset: ubuntu-bionic
+    vars:
+      puppet: 6
+
+
diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml
new file mode 100644
index 000000000..cfa631e63
--- /dev/null
+++ b/zuul.d/tripleo.yaml
@@ -0,0 +1,51 @@
+---
+# This file contains the tripleo jobs for the puppet modules
+#
+- job:
+    name: tripleo-puppet-ci-centos-7-undercloud-containers
+    parent: tripleo-ci-centos-7-undercloud-containers
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+
+- project-template:
+    name: tripleo-puppet-undercloud
+    check:
+      jobs:
+        - tripleo-puppet-ci-centos-7-undercloud-containers
+    gate:
+      jobs:
+        - tripleo-puppet-ci-centos-7-undercloud-containers
+
+- job:
+    name: tripleo-puppet-ci-centos-7-standalone
+    parent: tripleo-ci-centos-7-standalone
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+
+- project-template:
+    name: tripleo-puppet-standalone
+    check:
+      jobs:
+        - tripleo-puppet-ci-centos-7-standalone
+    gate:
+      jobs:
+        - tripleo-puppet-ci-centos-7-standalone
+
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
new file mode 100644
index 000000000..343648483
--- /dev/null
+++ b/zuul.d/unit.yaml
@@ -0,0 +1,48 @@
+---
+# This file contains the puppet unit job configurations
+#
+- job:
+    name: puppet-openstack-unit-4.8-centos-7
+    parent: puppet-openstack-unit-base
+    nodeset: centos-7
+    vars:
+      puppet_gem_version: 4.8
+
+- job:
+    name: puppet-openstack-unit-5.5-centos-7
+    parent: puppet-openstack-unit-base
+    nodeset: centos-7
+    vars:
+      puppet_gem_version: 5.5
+
+- job:
+    name: puppet-openstack-unit-6.0-ubuntu-bionic
+    parent: puppet-openstack-unit-base
+    nodeset: ubuntu-bionic
+    branches: ^master
+    vars:
+      puppet_gem_version: 6.0
+
+- job:
+    name: puppet-openstack-unit-latest-ubuntu-bionic
+    parent: puppet-openstack-unit-base
+    nodeset: ubuntu-bionic
+    branches: ^master
+    voting: false
+    vars:
+      puppet_gem_version: latest
+
+
+- project-template:
+    name: puppet-openstack-module-unit-jobs
+    check:
+      jobs:
+        - puppet-openstack-unit-4.8-centos-7
+        - puppet-openstack-unit-5.5-centos-7
+        - puppet-openstack-unit-6.0-ubuntu-bionic
+        - puppet-openstack-unit-latest-ubuntu-bionic
+    gate:
+      jobs:
+        - puppet-openstack-unit-4.8-centos-7
+        - puppet-openstack-unit-5.5-centos-7
+        - puppet-openstack-unit-6.0-ubuntu-bionic