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

support Debian 9 (#404) #416

Merged
merged 1 commit into from
Nov 4, 2017
Merged

support Debian 9 (#404) #416

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
12 changes: 6 additions & 6 deletions .sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
---
.travis.yml:
extras:
- rvm: 2.3.1
- rvm: 2.4.2
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8
bundler_args: --without development release
- rvm: 2.4.2
env: PUPPET_INSTALL_TYPE=agent CHECK=beaker BEAKER_debug=true BEAKER_set=docker/debian-9 BEAKER_VERSION='~> 3.27'
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
- rvm: 2.4.2
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
- rvm: 2.4.2
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04
services: docker
sudo: required
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ matrix:
- rvm: 2.4.2
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
- rvm: 2.3.1
- rvm: 2.4.2
bundler_args: --without development
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7
services: docker
sudo: required
- rvm: 2.3.1
bundler_args: --without development
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8
- rvm: 2.4.2
bundler_args: --without development release
env: PUPPET_INSTALL_TYPE=agent CHECK=beaker BEAKER_debug=true BEAKER_set=docker/debian-9 BEAKER_VERSION='~> 3.27'
services: docker
sudo: required
- rvm: 2.3.1
- rvm: 2.4.2
bundler_args: --without development
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
services: docker
sudo: required
- rvm: 2.3.1
- rvm: 2.4.2
bundler_args: --without development
env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04
services: docker
Expand Down
6 changes: 5 additions & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,12 @@
if versioncmp($::operatingsystemrelease, '8') >= 0 {
$set_votequorum = true
$manage_pacemaker_service = true
$package_install_options = ['-t', 'jessie-backports']
$test_corosync_config = true
if versioncmp($::operatingsystemrelease, '8') == 0 {
$package_install_options = ['-t', 'jessie-backports']
} else {
$package_install_options = undef
}
} else {
$set_votequorum = false
$manage_pacemaker_service = false
Expand Down
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"8"
"8",
"9"
]
},
{
Expand Down