diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 021dd8f7e0..4eafa73aee 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -144,6 +144,7 @@ tripleo:
       - openstack/os-apply-config
       - openstack/os-cloud-config
       - openstack/os-collect-config
+      - openstack/os-net-config
       - openstack/os-refresh-config
       - openstack/python-tuskarclient
       - openstack/tripleo-heat-templates
@@ -784,6 +785,7 @@ openstack-merges:
       - openstack/diskimage-builder
       - openstack/os-apply-config
       - openstack/os-collect-config
+      - openstack/os-net-config
       - openstack/os-refresh-config
       - openstack/tripleo-heat-templates
       - openstack/tripleo-image-elements
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 82596b2537..275a9aadef 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1790,6 +1790,15 @@
       - python-jobs
       - pypi-jobs
 
+- project:
+    name: os-net-config
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: os-refresh-config
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh
index 27b1bfe6be..fdfd962235 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh
@@ -87,6 +87,7 @@ git clone https://review.openstack.org/p/openstack/nova
 git clone https://review.openstack.org/p/openstack/os-apply-config
 git clone https://review.openstack.org/p/openstack/os-cloud-config
 git clone https://review.openstack.org/p/openstack/os-collect-config
+git clone https://review.openstack.org/p/openstack/os-net-config
 git clone https://review.openstack.org/p/openstack/os-refresh-config
 git clone https://review.openstack.org/p/openstack/oslo.config
 git clone https://review.openstack.org/p/openstack/oslo.messaging
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index c1af502e23..d530b8866e 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -352,6 +352,9 @@
   acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
 - project: openstack/os-collect-config
   description: Collect and cache metadata, run hooks on changes.
+- project: openstack/os-net-config
+  upstream: git://github.com/dprince/os-net-config.git
+  description: Host network configuration tool
   acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
 - project: openstack/os-refresh-config
   description: Restart services and coordinate data migration on Heat config changes.
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 7a34579524..9f75e2d27b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2025,6 +2025,30 @@ projects:
       - os-collect-config-coverage
       - os-collect-config-branch-tarball
 
+#TODO: add docs
+  - name: openstack/os-net-config
+    template:
+      - name: merge-check
+      - name: check-requirements
+      - name: publish-to-pypi
+    check:
+      - gate-os-net-config-pep8
+      - gate-os-net-config-python26
+      - gate-os-net-config-python27
+    check-tripleo:
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
+    gate:
+      - gate-os-net-config-pep8
+      - gate-os-net-config-python26
+      - gate-os-net-config-python27
+    experimental-tripleo:
+      - check-tripleo-novabm-overcloud-precise-nonha
+    post:
+      - os-net-config-coverage
+      - os-net-config-branch-tarball
+
 #TODO: add docs
   - name: openstack/os-refresh-config
     template: