diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 43425dd34a..ef515ac8f7 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -659,6 +659,7 @@ openstack-keystone:
       - openstack/identity-api
       - openstack/keystone-specs
       - openstack/python-keystoneclient
+      - openstack/python-keystoneclient-federation
       - openstack/python-keystoneclient-kerberos
       - openstack/keystonemiddleware
     branches:
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 bf60960d53..aedef28a60 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1213,6 +1213,17 @@
       - pypi-jobs
 
 
+- project:
+    name: python-keystoneclient-federation
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
+
 - project:
     name: python-keystoneclient-kerberos
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index bc90bec3dd..ec98f82899 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -446,6 +446,10 @@
 - project: openstack/python-ironicclient
   description: A python client implementing the Ironic API.
 - project: openstack/python-keystoneclient
+- project: openstack/python-keystoneclient-federation
+  description: Federation authentication plugins for OpenStack clients.
+  acl-config: /home/gerrit2/acls/openstack/python-keystoneclient.config
+  upstream: git://github.com/jamielennox/python-keystoneclient-federation.git
 - project: openstack/python-keystoneclient-kerberos
   description: Kerberos authentication plugins for OpenStack clients.
   acl-config: /home/gerrit2/acls/openstack/python-keystoneclient.config
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 1f2789ec54..58aaa31a83 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1645,6 +1645,14 @@ projects:
       - check-tripleo-novabm-overcloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
 
+  - name: openstack/python-keystoneclient-federation
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: python3-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
+
   - name: openstack/python-keystoneclient-kerberos
     template:
       - name: merge-check