diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 76aae483ff..261fcb0bfb 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -66,6 +66,7 @@ class openstack_server ($iptables_public_tcp_ports) {
     sysadmin => ['corvus@inaugust.com',
                  'mordred@inaugust.com',
                  'andrew@linuxjedi.co.uk',
-                 'devananda.vdv@gmail.com']
+                 'devananda.vdv@gmail.com',
+                 'clark.boylan@gmail.com']
   }
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index 903cfbd0c0..72bed07815 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -414,6 +414,17 @@ node "pypi.openstack.org" {
   }
 }
 
+node 'etherpad.openstack.org' {
+  include openstack_cron
+  class { 'openstack_server':
+    iptables_public_tcp_ports => [22, 80, 443]
+  }
+
+  realize (
+    User::Virtual::Localuser["clarkb"],
+  )
+}
+
 node 'etherpadlite.openstack.org' {
   include openstack_cron
   class { 'openstack_server':
diff --git a/manifests/users.pp b/manifests/users.pp
index 937d247239..8af6643cd9 100644
--- a/manifests/users.pp
+++ b/manifests/users.pp
@@ -35,4 +35,9 @@ class openstack_project::users {
     realname => 'Duncan McGreggor',
     sshkeys  => "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAttca0Lahzo1rskWcCGwYh71ADmUsn/6RNBd7H7WVsX+QTacq90fpNghFNTen4I7tC1p0IemwHcCOb1noeXkjxl7W5r7l0OhiqMHp/u2ao0F3dINryuNEww2IHRhY6GwwGJ+slv+i4/FviUgqHZVzopUon/9VY0mu1wfu3vTRw0qXsvqr09Jiavt/8gJ0Fa5PsYkf7l0edFk0scTmGp3G4HY/ZvnbChfZMg6L/xcGPtK/GbLYg6PGtLVVnubXMtxD9GZYhwrY0i9Z2egcRI2W7IznM4OGFzYgA9HZqylPoWt4+ghzC5azUlbO2u6+8HigJVblAGHRWcznEf/ZDR3erw== oubiwann@rhosgobel\n",
   }
+
+  @user::virtual::localuser { 'clarkb':
+    realname => 'Clark Boylan',
+    sshkeys  => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlH6SNieyGDWNl4b9TM+zUgk+XTXRtqxyYxNh1p5e00u/ZrZPVrc7buPhnTHzEde0ABX0vgnZI2rC5Hf9cYY0aRgLHDuikQ4CQHPucslgZ5linjtWx5AuURp+oaJRCj00UZubJsatUx5vz+D4MGRLYmL+MErftYdI4sBbolATfLVwjrmxsd6KF1BZ0+9eEv2Xrk+yXN1A5RGPKBiuE6viDMZxrOuy7IW8+TQZW1LrsbTCAD1b+J5Nx0z/Hn3Rz71zEibdwM9xgu5vROu3p9kdaxu+Ndg/SvCCWlzoLQSeIAmcfGUlWg9IjEc3sQexX9BmUAsKQtu3aZFgq2V7aqtDN boylancl@boylancl1\n",
+  }
 }