From f42290f68c22d8e61cdfc24eaf40b691f23acb3c Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 7 Feb 2013 13:56:07 +0000 Subject: [PATCH] Open port 80 on summit.o.o and add ttx. * manifests/site.pp: Change the summit node to be an instance of the new summit class rather than the more generic server class. * modules/openstack_project/manifests/summit.pp: Add a new summit class based on server, but open 80/tcp and realize an account for ttx. Also explicitly list 22/tcp even though it's already included by the server class. * modules/openstack_project/manifests/users.pp: Add an entry for ttx with his name and SSH public key. Change-Id: Idc4f0f30a89da12eeb8ee770e0ba0f0a2978bf5f Reviewed-on: https://review.openstack.org/21430 Reviewed-by: Clark Boylan Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- manifests/site.pp | 2 +- modules/openstack_project/manifests/summit.pp | 14 ++++++++++++++ modules/openstack_project/manifests/users.pp | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 modules/openstack_project/manifests/summit.pp diff --git a/manifests/site.pp b/manifests/site.pp index 0fdca5c5ef..5d04dc6ba1 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -188,7 +188,7 @@ node 'logstash.openstack.org' { # A machine to run ODSREG in preparation for summits. node 'summit.openstack.org' { - class { 'openstack_project::server': + class { 'openstack_project::summit': sysadmins => hiera('sysadmins'), } } diff --git a/modules/openstack_project/manifests/summit.pp b/modules/openstack_project/manifests/summit.pp new file mode 100644 index 0000000000..6fab20f542 --- /dev/null +++ b/modules/openstack_project/manifests/summit.pp @@ -0,0 +1,14 @@ +class openstack_project::summit ( + $sysadmins = [] +) { + class { 'openstack_project::server': + iptables_public_tcp_ports => [22, 80], + sysadmins => $sysadmins + } + + realize ( + User::Virtual::Localuser['ttx'], + ) +} + +# vim:sw=2:ts=2:expandtab:textwidth=79 diff --git a/modules/openstack_project/manifests/users.pp b/modules/openstack_project/manifests/users.pp index e98e28a2c5..6fac44e084 100644 --- a/modules/openstack_project/manifests/users.pp +++ b/modules/openstack_project/manifests/users.pp @@ -45,4 +45,9 @@ class openstack_project::users { realname => 'Jeremy Stanley', sshkeys => "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzKUUBTKJf6CGyz96JbmVSOSzf6LgXRmbyvSkSnD8EnBPFugWF5h/pPmLTVRfUzuR8p1CAR8ziNv0kJZexHvRbp0n06HWERWdK9AXr4utlJr9oc3b50Mmd5GHQp2QLd2sQrMx8G0pimPVoKPTVNvrlwrY1hjHldugX9IqD2QWIYsQEnqXHiVrCCiIcJFe/Gr/Qmz9nWTXN0fEQ7wsmrHAQtAs7YHJ/fNuS4JOtBTXS5trs9tcIBtPFyB2OeyOq85Wvg/IyHBv9Va2Zjccmu8+cedOsrz0YtOSb++uFAyeAe8BFEKD0EmHwhXVrG9UTWdNgQgL+YzdPPifjEbEh3HQoQ== fungi@yuggoth.org\n", } + + @user::virtual::localuser { 'ttx': + realname => 'Thierry Carrez', + sshkeys => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIF2INBeJdT3nT3+3yac+DGRQVN7wPv/GTb/OPDocQhfGMeQP7JwSURiv1nrXGbbjzuip7l7vRJs4u4NqXkUi0GFj1aLBpUm2Z1NFFDn4cuZ5KCYX6rjVrDYIpj4OlOyzt9YGONvvH/dB2GHw8kYbN50OalFWQCS0TVzj9SQbO47B/TPdtLnh116yEP5AXZZUGgl+q533/x8+nxAxJKA9iAk3mSswl67gXc4pRo84pjwpx+R/52ha6RfmLkoNAEOqtr5MGx5gyW+WXsoLJBl2bjcfzYoQI7gPWRIn+rtCnDFi762TS54zstXxR1ww+ppmqHk04l2oprNoI0wr00Fsl ttx@stardust\n", + } }