Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LSST3559 remove ncsa bastion node #237

Merged
merged 1 commit into from
Oct 21, 2020
Merged

LSST3559 remove ncsa bastion node #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hieradata/org/ncsa/role/csc_generic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
classes:
- profile::ncsa::allow_qualys_scan
- profile::ncsa::allow_ssh_from_bastion
- profile::ncsa::allow_ssh_from_login
- profile::ncsa::baseline_cfg
- profile::ncsa::system_authnz
Expand Down
1 change: 0 additions & 1 deletion hieradata/org/ncsa/role/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
classes:
- profile::ncsa::allow_qualys_scan
- profile::ncsa::allow_ssh_from_bastion
- profile::ncsa::allow_ssh_from_login
- profile::ncsa::baseline_cfg
- profile::ncsa::system_authnz
Expand Down
1 change: 0 additions & 1 deletion hieradata/org/ncsa/role/headerservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
classes:
- profile::ncsa::allow_qualys_scan
- profile::ncsa::allow_ssh_from_bastion
- profile::ncsa::allow_ssh_from_login
- profile::ncsa::baseline_cfg
- profile::ncsa::system_authnz
Expand Down
1 change: 0 additions & 1 deletion hieradata/org/ncsa/role/lhntest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
classes:
- profile::ncsa::allow_qualys_scan
- profile::ncsa::allow_ssh_from_bastion
- profile::ncsa::allow_ssh_from_bdc
- profile::ncsa::allow_ssh_from_login
- profile::ncsa::baseline_cfg
Expand Down
1 change: 0 additions & 1 deletion hieradata/org/ncsa/role/puppet_master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ classes:
- "::profile::docker"
- "::profile::ncsa::allow_qualys_scan"
- "::profile::ncsa::allow_ssh_from_login"
- "::profile::ncsa::allow_ssh_from_bastion"
- "::profile::ncsa::baseline_cfg"
- "::profile::ncsa::puppet_master"
- "::profile::ncsa::system_authnz"
Expand Down
2 changes: 0 additions & 2 deletions hieradata/site/nts/role/puppet_master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
profile::ncsa::allow_ssh_from_bastion:
- "lsst_level1_adm"
profile::ncsa::allow_ssh_from_login:
- "lsst_level1_adm"
profile::ncsa::allow_sudo::groups:
Expand Down
9 changes: 0 additions & 9 deletions site/profile/data/org/ncsa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---
# Override default hiera lookup options (keep this at the top)
lookup_options:
profile::ncsa::allow_ssh_from_bastion::allow_groups:
merge: "unique"
profile::ncsa::allow_ssh_from_bdc::allow_groups:
merge: "unique"
profile::ncsa::allow_ssh_from_login::allow_groups:
Expand All @@ -14,13 +12,6 @@ lookup_options:

# Everything else goes down below. Sort keys alphabetically

profile::ncsa::allow_ssh_from_bastion::allow_groups:
- "lsst_admin_ncsa"
- "lsst_int_bastion"
profile::ncsa::allow_ssh_from_bastion::bastion_nodelist:
- "10.142.181.15"
- "141.142.181.15"
profile::ncsa::allow_ssh_from_bastion::custom_cfg: {}

profile::ncsa::allow_ssh_from_bdc::allow_groups:
- "lsst_admin_ncsa"
Expand Down
45 changes: 0 additions & 45 deletions site/profile/manifests/ncsa/allow_ssh_from_bastion.pp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion site/profile/manifests/ncsa/allow_ssh_from_login.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# allow_groups
# Type: Array
# Desc: one or more LDAP / UNIX groups that are allowed to login from
# any of the nodes in bastion_nodelist
# any of the nodes in login_nodelist
# Note: can be empty
# @example
# include profile::allow_ssh_from_login
Expand Down