diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a38fa1..ac42dc2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,136 +1,136 @@ name: CI on: push: branches: - main - master pull_request: jobs: unit: runs-on: ubuntu-latest continue-on-error: ${{ matrix.allow_failure }} strategy: fail-fast: false matrix: include: - - ruby: 2.4.9 - puppet: 5 - fixtures: .fixtures.yml - allow_failure: false - ruby: 2.5.7 puppet: 6 fixtures: .fixtures.yml allow_failure: false - - ruby: 2.4.9 - puppet: 5 - fixtures: .fixtures-latest.yml - allow_failure: true + - ruby: 2.7.0 + puppet: 7 + fixtures: .fixtures.yml + allow_failure: false - ruby: 2.5.7 puppet: 6 fixtures: .fixtures-latest.yml allow_failure: true + - ruby: 2.7.0 + puppet: 7 + fixtures: .fixtures-latest.yml + allow_failure: true env: BUNDLE_WITHOUT: system_tests:release PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.0" FACTER_GEM_VERSION: "< 4.0" FIXTURES_YML: ${{ matrix.fixtures }} name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }}) steps: - uses: actions/checkout@v2 - name: Setup ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} bundler-cache: true bundler: '2.1.0' - name: Validate run: bundle exec rake check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint - name: Run tests run: bundle exec rake parallel_spec acceptance: runs-on: ubuntu-latest strategy: fail-fast: false matrix: set: - "centos-7" - "centos-8" - "debian-9" - "debian-10" - "ubuntu-1804" puppet: - - "puppet5" - "puppet6" + - "puppet7" keycloak_version: - "8.0.1" - "12.0.1" keycloak_full: - "no" keycloak_domain_mode_cluster: - "no" include: - set: "centos-7" - puppet: "puppet5" + puppet: "puppet6" keycloak_version: "8.0.1" keycloak_full: "yes" - set: "centos-7" - puppet: "puppet5" + puppet: "puppet6" keycloak_version: "12.0.1" keycloak_full: "yes" - set: "centos-7" - puppet: "puppet6" + puppet: "puppet7" keycloak_version: "8.0.1" keycloak_full: "yes" - set: "centos-7" - puppet: "puppet6" + puppet: "puppet7" keycloak_version: "12.0.1" keycloak_full: "yes" - set: "centos-7-domain-mode-cluster" - puppet: "puppet5" + puppet: "puppet6" keycloak_version: "8.0.1" keycloak_domain_mode_cluster: "yes" - set: "centos-7-domain-mode-cluster" - puppet: "puppet5" + puppet: "puppet6" keycloak_version: "12.0.1" keycloak_domain_mode_cluster: "yes" - set: "centos-7-domain-mode-cluster" - puppet: "puppet6" + puppet: "puppet7" keycloak_version: "8.0.1" keycloak_domain_mode_cluster: "yes" - set: "centos-7-domain-mode-cluster" - puppet: "puppet6" + puppet: "puppet7" keycloak_version: "12.0.1" keycloak_domain_mode_cluster: "yes" env: BUNDLE_WITHOUT: development:release BEAKER_debug: true name: ${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }}) steps: - name: Enable IPv6 on docker run: | echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json sudo service docker restart # https://github.com/actions/virtual-environments/issues/181#issuecomment-610874237 - name: apparmor run: | set -x sudo apt-get remove mysql-server --purge sudo apt-get install apparmor-profiles sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - uses: actions/checkout@v2 - name: Setup ruby uses: ruby/setup-ruby@v1 with: ruby-version: '2.7' bundler-cache: true bundler: '2.1.0' - name: Run tests run: bundle exec rake beaker env: BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet }} BEAKER_set: ${{ matrix.set }} BEAKER_keycloak_version: ${{ matrix.keycloak_version }} BEAKER_keycloak_full: ${{ matrix.keycloak_full }} BEAKER_keycloak_domain_mode_cluster: ${{ matrix.keycloak_domain_mode_cluster }} diff --git a/.sync.yml b/.sync.yml index 0ee2197..e6d05c6 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,83 +1,83 @@ --- .github/workflows/ci.yaml: unit_name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }}) unit_includes: - - ruby: '2.4.9' - puppet: '5' - fixtures: .fixtures-latest.yml - allow_failure: true - ruby: '2.5.7' puppet: '6' fixtures: .fixtures-latest.yml allow_failure: true + - ruby: '2.7.0' + puppet: '7' + fixtures: .fixtures-latest.yml + allow_failure: true acceptance_name: '${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }})' acceptance_matrix: set: - centos-7 - centos-8 - debian-9 - debian-10 - ubuntu-1804 puppet: - - puppet5 - puppet6 + - puppet7 keycloak_version: - '8.0.1' - '12.0.1' keycloak_full: ['no'] keycloak_domain_mode_cluster: ['no'] acceptance_includes: - set: centos-7 - puppet: puppet5 + puppet: puppet6 keycloak_version: 8.0.1 keycloak_full: 'yes' - set: centos-7 - puppet: puppet5 + puppet: puppet6 keycloak_version: 12.0.1 keycloak_full: 'yes' - set: centos-7 - puppet: puppet6 + puppet: puppet7 keycloak_version: 8.0.1 keycloak_full: 'yes' - set: centos-7 - puppet: puppet6 + puppet: puppet7 keycloak_version: 12.0.1 keycloak_full: 'yes' - set: centos-7-domain-mode-cluster - puppet: puppet5 + puppet: puppet6 keycloak_version: 8.0.1 keycloak_domain_mode_cluster: 'yes' - set: centos-7-domain-mode-cluster - puppet: puppet5 + puppet: puppet6 keycloak_version: 12.0.1 keycloak_domain_mode_cluster: 'yes' - set: centos-7-domain-mode-cluster - puppet: puppet6 + puppet: puppet7 keycloak_version: 8.0.1 keycloak_domain_mode_cluster: 'yes' - set: centos-7-domain-mode-cluster - puppet: puppet6 + puppet: puppet7 keycloak_version: 12.0.1 keycloak_domain_mode_cluster: 'yes' .gitignore: paths: - /vagrant/.vagrant/ - /vagrant/*.log .gitlab-ci.yml: delete: true appveyor.yml: delete: true spec/acceptance/nodesets/centos-6.yml: delete: true spec/acceptance/nodesets/debian-8.yml: delete: true spec/acceptance/nodesets/debian-10.yml: packages: - iproute2 spec/acceptance/nodesets/ubuntu-1404.yml: delete: true spec/acceptance/nodesets/ubuntu-1604.yml: delete: true spec/acceptance/nodesets/ubuntu-1804.yml: packages: - iproute2 diff --git a/manifests/service.pp b/manifests/service.pp index c8082b3..9b1bccb 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -1,21 +1,18 @@ # Private class. class keycloak::service { assert_private() - if $::service_provider == 'systemd' { - ::systemd::unit_file { 'keycloak.service': - content => template('keycloak/keycloak.service.erb'), - notify => Service['keycloak'], - } - Exec['systemctl-daemon-reload'] -> Service['keycloak'] + systemd::unit_file { 'keycloak.service': + content => template('keycloak/keycloak.service.erb'), + notify => Service['keycloak'], } service { 'keycloak': ensure => $keycloak::service_ensure, enable => $keycloak::service_enable, name => $keycloak::service_name, hasstatus => $keycloak::service_hasstatus, hasrestart => $keycloak::service_hasrestart, } } diff --git a/metadata.json b/metadata.json index 800f222..00cf0dd 100644 --- a/metadata.json +++ b/metadata.json @@ -1,93 +1,93 @@ { "name": "treydock-keycloak", "version": "6.25.2", "author": "treydock", "summary": "Keycloak Puppet module", "license": "Apache-2.0", "source": "https://github.com/treydock/puppet-module-keycloak", "project_page": "https://github.com/treydock/puppet-module-keycloak", "issues_url": "https://github.com/treydock/puppet-module-keycloak/issues", "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.25.0 <7.0.0" }, { "name": "puppetlabs/mysql", "version_requirement": ">= 10.2.0 <11.0.0" }, { "name": "puppetlabs/postgresql", "version_requirement": ">= 6.4.0 <7.0.0" }, { "name": "puppetlabs/java", "version_requirement": ">= 5.0.0 <7.0.0" }, { "name": "puppetlabs/java_ks", "version_requirement": ">= 1.0.0 <4.0.0" }, { "name": "puppetlabs/augeas_core", "version_requirement": ">= 1.0.0 <4.0.0" }, { "name": "puppetlabs/yumrepo_core", "version_requirement": ">= 1.0.0 <2.0.0" }, { "name": "puppet/archive", "version_requirement": ">= 0.5.1 <5.0.0" }, { "name": "camptocamp/systemd", "version_requirement": ">= 0.4.0 <3.0.0" } ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", "8" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", "8" ] }, { "operatingsystem": "Scientific", "operatingsystemrelease": [ "7", "8" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "9", "10" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "18.04" ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 5.0.0 < 7.0.0" + "version_requirement": ">= 6.0.0 < 8.0.0" } ], "pdk-version": "1.17.0", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-g1f52e6d" + "template-ref": "heads/master-0-gc21ae9d" }