diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index eb42346fdb..9e84d24ec4 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -209,6 +209,7 @@ puppet-openstack:
       - stackforge/puppet-openstack_dev_env
       - stackforge/puppet-swift
       - stackforge/puppet-tempest
+      - stackforge/puppet-vswitch
     branches:
       - master
       - stable/grizzly
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index cd952a8700..92a43fe44a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1164,6 +1164,17 @@
       - gate-{name}-puppet-syntax
       - puppet-module-unit
 
+- project:
+    name: puppet-vswitch
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - gate-{name}-puppet-lint
+      - gate-{name}-puppet-syntax
+      - puppet-module-unit
+
 - project:
     name: openstack-chef-repo
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f811286c74..8712ceb2f2 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -291,6 +291,11 @@ jobs:
     voting: false
   - name: gate-python-tuskarclient-python33
     voting: false
+# puppet-openstack targets
+  - name: gate-puppet-vswitch-puppet-lint
+    voting: false
+  - name: gate-puppet-vswitch-puppet-syntax
+    voting: false
 
 projects:
   - name: openstack-infra/zuul
@@ -2689,6 +2694,18 @@ projects:
       - gate-puppet-tempest-puppet-unit-3.0
       - gate-puppet-tempest-puppet-unit-3.1
 
+  - name: stackforge/puppet-vswitch
+    check:
+      - gate-puppet-vswitch-puppet-lint
+      - gate-puppet-vswitch-puppet-syntax
+      - gate-puppet-vswitch-puppet-unit-2.7
+      - gate-puppet-vswitch-puppet-unit-3.0
+      - gate-puppet-vswitch-puppet-unit-3.1
+    gate:
+      - gate-puppet-vswitch-puppet-unit-2.7
+      - gate-puppet-vswitch-puppet-unit-3.0
+      - gate-puppet-vswitch-puppet-unit-3.1
+
   - name: stackforge/puppet-openstack_dev_env
     check:
       - gate-noop
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index ba8d50e07a..6b19d667ec 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -259,6 +259,10 @@
   description: OpenStack Neutron Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/bodepd/puppet-quantum.git
+- project: stackforge/puppet-vswitch
+  description: "Puppet provider for virtual switches."
+  acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
+  upstream: git://github.com/hogepodge/puppet-vswitch.git
 - project: stackforge/opencafe
   upstream: https://github.com/samu4924/opencafe
   description: "Common Automation Framework Engine. Core driver for CloudCAFE"