summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-03-03 11:52:40 +0100
committerLeif Johansson <leifj@sunet.se>2014-03-03 11:52:40 +0100
commitf11427319129451ff2cb2a7c986b70f4cdc0121a (patch)
tree059719cd263221e42c2388b46922c934bd25c772
parent8cb5ad3714fe14f909a285a4aed5d9add6518442 (diff)
ssh and bastion for sunetsunet-ops-2014-03-03-v08
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml2
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp4
2 files changed, 1 insertions, 5 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 137bd28..0271f1f 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -5,4 +5,4 @@
sunet-cdr:
sunet:
'\.swamid\.se$':
- swamid:
+ sunet:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 69ac954..ab24b11 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -315,7 +315,3 @@ class sunet-cdr {
class { 'sunet-dhcp-hosts': }
}
-
-class swamid {
- sunet::server { 'sunet_server': }
-}