diff --git a/manifests/site.pp b/manifests/site.pp
index 9b640cada2..cb057d55f2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1141,4 +1141,40 @@ node /.*wheel-mirror-.*\.openstack\.org/ {
   }
 }
 
+# Node-OS: trusty
+node 'controller00.hpuswest.ic.openstack.org' {
+  $group = 'infracloud'
+  class { '::openstack_project::server':
+    iptables_public_tcp_ports => [5000,5672,8774,9292,9696,35357], # keystone,rabbit,nova,glance,neutron,keystone
+    sysadmins                 => hiera('sysadmins', []),
+    enable_unbound            => false,
+  }
+  class { '::openstack_project::infracloud::controller':
+    neutron_rabbit_password          => hiera('neutron_rabbit_password'),
+    nova_rabbit_password             => hiera('nova_rabbit_password'),
+    root_mysql_password              => hiera('infracloud_mysql_password'),
+    keystone_mysql_password          => hiera('keystone_mysql_password'),
+    glance_mysql_password            => hiera('glance_mysql_password'),
+    neutron_mysql_password           => hiera('neutron_mysql_password'),
+    nova_mysql_password              => hiera('nova_mysql_password'),
+    keystone_admin_password          => hiera('keystone_admin_password'),
+    glance_admin_password            => hiera('glance_admin_password'),
+    neutron_admin_password           => hiera('neutron_admin_password'),
+    nova_admin_password              => hiera('nova_admin_password'),
+    keystone_admin_token             => hiera('keystone_admin_token'),
+    ssl_chain_file_contents          => hiera('ssl_chain_file_contents'),
+    keystone_ssl_key_file_contents   => hiera('keystone_ssl_key_file_contents'),
+    keystone_ssl_cert_file_contents  => hiera('keystone_ssl_cert_file_contents'),
+    glance_ssl_key_file_contents     => hiera('glance_ssl_key_file_contents'),
+    glance_ssl_cert_file_contents    => hiera('glance_ssl_cert_file_contents'),
+    neutron_ssl_key_file_contents    => hiera('neutron_ssl_key_file_contents'),
+    neutron_ssl_cert_file_contents   => hiera('neutron_ssl_cert_file_contents'),
+    nova_ssl_key_file_contents       => hiera('nova_ssl_key_file_contents'),
+    nova_ssl_cert_file_contents      => hiera('nova_ssl_cert_file_contents'),
+    br_name                          => 'br-vlan25',
+    controller_management_address    => '10.10.16.146',
+    controller_public_address        => $::fqdn,
+  }
+}
+
 # vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/modules/openstack_project/manifests/infracloud/controller.pp b/modules/openstack_project/manifests/infracloud/controller.pp
new file mode 100644
index 0000000000..1bf470959e
--- /dev/null
+++ b/modules/openstack_project/manifests/infracloud/controller.pp
@@ -0,0 +1,53 @@
+class openstack_project::infracloud::controller (
+  $neutron_rabbit_password,
+  $nova_rabbit_password,
+  $root_mysql_password,
+  $keystone_mysql_password,
+  $glance_mysql_password,
+  $neutron_mysql_password,
+  $nova_mysql_password,
+  $glance_admin_password,
+  $keystone_admin_password,
+  $neutron_admin_password,
+  $nova_admin_password,
+  $keystone_admin_token,
+  $ssl_chain_file_contents,
+  $keystone_ssl_key_file_contents,
+  $keystone_ssl_cert_file_contents,
+  $neutron_ssl_key_file_contents,
+  $neutron_ssl_cert_file_contents,
+  $glance_ssl_key_file_contents,
+  $glance_ssl_cert_file_contents,
+  $nova_ssl_key_file_contents,
+  $nova_ssl_cert_file_contents,
+  $br_name,
+  $controller_management_address,
+  $controller_public_address = $::fqdn,
+) {
+  class { '::infracloud::controller':
+    neutron_rabbit_password          => $neutron_rabbit_password,
+    nova_rabbit_password             => $nova_rabbit_password,
+    root_mysql_password              => $root_mysql_password,
+    keystone_mysql_password          => $keystone_mysql_password,
+    glance_mysql_password            => $glance_mysql_password,
+    neutron_mysql_password           => $neutron_mysql_password,
+    nova_mysql_password              => $nova_mysql_password,
+    keystone_admin_password          => $keystone_admin_password,
+    glance_admin_password            => $glance_admin_password,
+    neutron_admin_password           => $neutron_admin_password,
+    nova_admin_password              => $nova_admin_password,
+    keystone_admin_token             => $keystone_admin_token,
+    ssl_chain_file_contents          => $ssl_chain_file_contents,
+    keystone_ssl_key_file_contents   => $keystone_ssl_key_file_contents,
+    keystone_ssl_cert_file_contents  => $keystone_ssl_cert_file_contents,
+    glance_ssl_key_file_contents     => $neutron_ssl_key_file_contents,
+    glance_ssl_cert_file_contents    => $neutron_ssl_cert_file_contents,
+    neutron_ssl_key_file_contents    => $glance_ssl_key_file_contents,
+    neutron_ssl_cert_file_contents   => $glance_ssl_cert_file_contents,
+    nova_ssl_key_file_contents       => $nova_ssl_key_file_contents,
+    nova_ssl_cert_file_contents      => $nova_ssl_cert_file_contents,
+    br_name                          => $br_name,
+    controller_management_address    => $controller_management_address,
+    controller_public_address        => $controller_public_address,
+  }
+}