diff --git a/manifests/site.pp b/manifests/site.pp
index cbb4e0883a..09d8e80057 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -805,6 +805,8 @@ node 'nodepool.openstack.org' {
   $datacentred_username   = hiera('nodepool_datacentred_username', 'username')
   $datacentred_password   = hiera('nodepool_datacentred_password')
   $datacentred_project    = hiera('nodepool_datacentred_project', 'project')
+  $citycloud_username = hiera('nodepool_citycloud_username', 'username')
+  $citycloud_password = hiera('nodepool_citycloud_password')
   $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
   class { 'openstack_project::server':
     sysadmins                 => hiera('sysadmins', []),
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index ddacafb1ec..f804b62fd2 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -145,3 +145,15 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '2'
+  citycloud:
+    regions:
+      - Fra1
+      - Lon1
+      - Kna1
+    profile: citycloud
+    auth:
+      username: '<%= @citycloud_username %>'
+      password: '<%= @citycloud_password %>'
+      project_id: 1e6292e5893043a9b75ba0066079642c
+      project_domain_name: default
+      user_domain_id: c4a5013bd7e6427082ad11e5d260870d
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 1120d8b31f..a01faa4606 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -317,3 +317,15 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '2'
+  openstackzuul-citycloud:
+    regions:
+      - Fra1
+      - Lon1
+      - Kna1
+    profile: citycloud
+    auth:
+      username: <%= @puppetmaster_clouds['openstackzuul_citycloud_username'] %>
+      password: <%= @puppetmaster_clouds['openstackzuul_citycloud_password'] %>
+      project_id: 1e6292e5893043a9b75ba0066079642c
+      project_domain_name: default
+      user_domain_id: c4a5013bd7e6427082ad11e5d260870d