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

Missing default in case statement for pki in feature::api #596

Merged
merged 3 commits into from
Dec 18, 2019
Merged

Missing default in case statement for pki in feature::api #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
491782c
new default for icinga2 as pki in case statement in api
lbetz Dec 18, 2019
216e045
pin versions of modules chocolatey and zypprepo for puppet4 tests
lbetz Dec 18, 2019
4a6a6dd
remove puppet 4 tests
lbetz Dec 18, 2019
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: 1 addition & 0 deletions .bundle/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ BUNDLE_JOBS: "4"
BUNDLE_PATH: "vendor/bundle"
BUNDLE_DISABLE_SHARED_GEMS: "true"
BUNDLE_WITHOUT: "system_tests"
BUNDLE_BUILD: "--no-ri --no-rdoc"
6 changes: 2 additions & 4 deletions .fixtures.puppet4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ fixtures:
ref: 6.3.0
chocolatey:
repo: puppetlabs/chocolatey
ref: 3.3.0
zypprepo:
repo: puppet/zypprepo
yumrepo_core:
repo: "puppetlabs-yumrepo_core"
puppet_version: ">= 6.0.0"

ref: 2.2.2
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ matrix:
env: PUPPET_VERSION="~> 5.0" CHECK=test PARALLEL_TEST_PROCESSORS=4
rvm: 2.4.5
stage: spec
-
env: PUPPET_VERSION="~> 4.10" CHECK=test PARALLEL_TEST_PROCESSORS=4 FIXTURES_YML=.fixtures.puppet4.yml
rvm: 2.1.9
stage: spec
-
env: DEPLOY_TO_FORGE=yes
stage: deploy
Expand Down
3 changes: 2 additions & 1 deletion manifests/feature/api.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@
}
} # none

'icinga2': {
# icinga2 as default
default: {
$_ticket_salt = undef
$trusted_cert = "${cert_dir}/trusted-cert.crt"

Expand Down