Skip to content

Don't add useless users on ht prod #837

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

Draft
wants to merge 1 commit into
base: production
Choose a base branch
from
Draft

Don't add useless users on ht prod #837

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 manifests/profile/hathitrust/solr6.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

include nebula::profile::dns::smartconnect;

include nebula::profile::users
realize User['solr']

# parent dir structure for solr mounts, not all used by every use case
Expand Down
5 changes: 0 additions & 5 deletions manifests/role/hathitrust.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,17 @@
# include nebula::profile::hathitrust::hosts
class nebula::role::hathitrust (
String $internal_routing = '',
Boolean $afs = true,
) {
class { 'nebula::role::minimum':
internal_routing => $internal_routing,
}

if $facts['os']['family'] == 'Debian' {
include nebula::profile::krb5
if $afs {
include nebula::profile::afs
}
include nebula::profile::duo
include nebula::profile::exim4
include nebula::profile::grub
include nebula::profile::ntp
include nebula::profile::users
class { 'nebula::profile::networking':
bridge => false,
}
Expand Down
2 changes: 2 additions & 0 deletions manifests/role/hathitrust/dev.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
# include nebula::role::hathitrust::dev
class nebula::role::hathitrust::dev {
include nebula::role::hathitrust
include nebula::profile::users
include nebula::profile::afs
}
4 changes: 1 addition & 3 deletions manifests/role/hathitrust/solr/catalog.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
# @example
# include nebula::role::hathitrust::solr::catalog
class nebula::role::hathitrust::solr::catalog {
class { 'nebula::role::hathitrust':
afs => false,
}
include nebula::role::hathitrust

include nebula::profile::hathitrust::solr6::catalog
}
4 changes: 1 addition & 3 deletions manifests/role/hathitrust/solr/lss.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
# @example
# include nebula::role::hathitrust::solr::lss
class nebula::role::hathitrust::solr::lss {
class { 'nebula::role::hathitrust':
afs => false,
}
include nebula::role::hathitrust

include nebula::profile::hathitrust::solr6::lss
}
6 changes: 3 additions & 3 deletions spec/classes/role/htvm_webhost_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@

it { is_expected.to contain_class("nebula::profile::networking::firewall") }

it { is_expected.to contain_class("nebula::profile::krb5") }
it { is_expected.to contain_class("nebula::profile::afs") }
it { is_expected.to contain_class("nebula::profile::users") }
it { is_expected.not_to contain_class("nebula::profile::krb5") }
it { is_expected.not_to contain_class("nebula::profile::afs") }
it { is_expected.not_to contain_class("nebula::profile::users") }

if os == "debian-11-x86_64"
it { is_expected.not_to contain_package("php5-common") }
Expand Down
Loading