diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index ced24e073e..2ade618379 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -2,10 +2,12 @@ class openstack_project::puppetmaster (
   $sysadmins = []
 ) {
   class { 'openstack_project::server':
-    iptables_public_tcp_ports => [8140],
+    iptables_public_tcp_ports => [4505, 4506, 8140],
     sysadmins                 => $sysadmins
   }
 
+  class { 'salt::master': }
+
   cron { 'updatepuppetmaster':
     user        => 'root',
     minute      => '*/15',
diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp
index 71a41def0d..3a7e6753a6 100644
--- a/modules/openstack_project/manifests/slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -13,4 +13,7 @@ class openstack_project::slave (
   class { 'jenkins::slave':
     ssh_key => $openstack_project::jenkins_ssh_key
   }
+  class { 'salt':
+    salt_master => 'ci-puppetmaster.openstack.org',
+  }
 }