From f141197c56f4fe42d9a92ff2ee5be1d2d3bac006 Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 16:36:47 +0200 Subject: [PATCH 01/11] Fix yamlint warning --- molecule/default/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index b70410f..516a122 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,7 +8,7 @@ lint: platforms: - name: centos-7 image: fiercely/centos7:systemd - privileged: True + privileged: true volume_mounts: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" From d2acafcc4cafb56b9b620c3aeda5e74165b8249c Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 16:37:22 +0200 Subject: [PATCH 02/11] Replace categories by galaxy tags Fixing: E702: Use 'galaxy_tags' rather than 'categories' FIxing: E701: Role info should contain description --- meta/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index ce35404..91451fa 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,7 @@ --- galaxy_info: author: "Matthias Baumann & Jan Hentschel" + description: "Role to install kerberos server(s)" company: Ultra Tendency GmbH license: BSD 3-Clause min_ansible_version: 1.4 @@ -8,7 +9,7 @@ galaxy_info: - name: EL versions: - 7 - categories: + galaxy_tags: - kerberos - kdc -dependencies: [] +dependencies: [ ] From 03110f9b980fe3d52a351a6b8dba58ac9639d3bc Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 17:00:22 +0200 Subject: [PATCH 03/11] Fix shell set pipefail lines --- tasks/redhat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/redhat.yml b/tasks/redhat.yml index 8597478..acb319f 100644 --- a/tasks/redhat.yml +++ b/tasks/redhat.yml @@ -29,6 +29,7 @@ - name: Create the initial Kerberos database shell: > + set -o pipefail; echo -e "{{ kerberos_server_master_db_pass }}\n{{ kerberos_server_master_db_pass }}" | kdb5_util create -s; touch /var/kerberos/db_created creates=/var/kerberos/db_created @@ -41,6 +42,7 @@ - name: Create an admin user for administering the Kerberos database shell: > + set -o pipefail; echo -e "{{ kerberos_server_kadmin_pass }}\n{{ kerberos_server_kadmin_pass }}" | kadmin.local -q "addprinc {{ kerberos_server_kadmin_user }}/admin"; touch /var/kerberos/admin_created creates=/var/kerberos/admin_created From 4422c3a2a2f6c1adf7a22857f9e90c2ed0edd501 Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 17:50:04 +0200 Subject: [PATCH 04/11] Fix for molecule inconsistency https://github.com/ansible/molecule/issues/1727 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e91d598..7bb499f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ services: before_install: - sudo apt-get -qq update install: - - pip install molecule + - pip install molecule==22rc1 + - pip install cerberus==1.3.1 - pip install docker script: - molecule test From aabb172b4c94206048376a08346e9e9465d9945c Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 17:56:20 +0200 Subject: [PATCH 05/11] Fix molecule version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7bb499f..96f5bc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: before_install: - sudo apt-get -qq update install: - - pip install molecule==22rc1 + - pip install molecule==2.22rc1 - pip install cerberus==1.3.1 - pip install docker script: From a926b1aea96ca171b2b681bc7fd0bf7791b08fb9 Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 18:04:11 +0200 Subject: [PATCH 06/11] Add flake8 installation --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 96f5bc2..e5b6947 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ before_install: - sudo apt-get -qq update install: - pip install molecule==2.22rc1 + - pip install flake8 - pip install cerberus==1.3.1 - pip install docker script: From e45af56c7234a7a62a5e68a7d7bffe7ef5c8894f Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 18:12:37 +0200 Subject: [PATCH 07/11] Travis CI moved to python 3.6 Pythton 2.7 will be deprecated at 01.01.2010 --- molecule/default/tests/test_default.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 8a53ec3..a58732d 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -25,7 +25,7 @@ def test_kdc_conf(host): assert kdc_conf.is_file assert kdc_conf.user == 'root' assert kdc_conf.group == 'root' - assert oct(kdc_conf.mode) == '0600' + assert oct(kdc_conf.mode) == '0o600' @pytest.mark.parametrize('content', [ @@ -50,7 +50,7 @@ def test_kadm5_acl(host): assert kadm5_acl.is_file assert kadm5_acl.user == 'root' assert kadm5_acl.group == 'root' - assert oct(kadm5_acl.mode) == '0600' + assert oct(kadm5_acl.mode) == '0o600' @pytest.mark.parametrize('content', [ @@ -70,7 +70,7 @@ def test_krb5_conf(host): assert krb5_conf.is_file assert krb5_conf.user == 'root' assert krb5_conf.group == 'root' - assert oct(krb5_conf.mode) == '0644' + assert oct(krb5_conf.mode) == '0o644' @pytest.mark.parametrize('content', [ From cde5ca2ab76edc45797f725d7354ffb9bcba689c Mon Sep 17 00:00:00 2001 From: Evgeniy Ginzburg Date: Tue, 18 Jun 2019 18:27:43 +0200 Subject: [PATCH 08/11] FIx ansible deprecation warning --- tasks/redhat.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/redhat.yml b/tasks/redhat.yml index acb319f..6f4b427 100644 --- a/tasks/redhat.yml +++ b/tasks/redhat.yml @@ -4,9 +4,8 @@ - name: Install the kerberos packages yum: - name: "{{ item }}" + name: "{{ kerberos_server_redhat_pkg }}" state: present - with_items: "{{ kerberos_server_redhat_pkg }}" - name: Copy the KDC configuration file template: From 9983b137f82c21dad3244d277ca641cbf772a802 Mon Sep 17 00:00:00 2001 From: Laurent Hoss Date: Mon, 15 Jul 2019 16:06:25 +0200 Subject: [PATCH 09/11] fix octal file mode checks (to work in both ansible v2.7.x and v2.8.x) --- molecule/default/tests/test_default.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index a58732d..68cf4f4 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -25,7 +25,7 @@ def test_kdc_conf(host): assert kdc_conf.is_file assert kdc_conf.user == 'root' assert kdc_conf.group == 'root' - assert oct(kdc_conf.mode) == '0o600' + assert kdc_conf.mode == 0o600 @pytest.mark.parametrize('content', [ @@ -50,7 +50,7 @@ def test_kadm5_acl(host): assert kadm5_acl.is_file assert kadm5_acl.user == 'root' assert kadm5_acl.group == 'root' - assert oct(kadm5_acl.mode) == '0o600' + assert kadm5_acl.mode == 0o600 @pytest.mark.parametrize('content', [ @@ -70,7 +70,7 @@ def test_krb5_conf(host): assert krb5_conf.is_file assert krb5_conf.user == 'root' assert krb5_conf.group == 'root' - assert oct(krb5_conf.mode) == '0o644' + assert krb5_conf.mode == 0o644 @pytest.mark.parametrize('content', [ From 4418f4d7c87609f2f08cb0842e294c0d1758a8e4 Mon Sep 17 00:00:00 2001 From: Laurent Hoss Date: Mon, 15 Jul 2019 16:14:27 +0200 Subject: [PATCH 10/11] update to latest molecule 2.22rc3 (that fixes flake8 and cerberus dependencies) --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5b6947..9197db8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,8 @@ services: before_install: - sudo apt-get -qq update install: - - pip install molecule==2.22rc1 - - pip install flake8 - - pip install cerberus==1.3.1 + # Need to use the latest molecule 2.22 rc, for compatibility with ansible 2.8.x (provided in the used docker image) + - pip install molecule==2.22rc3 - pip install docker script: - molecule test From 49caf115244ca63a5b4d4589cb7ef362d93af369 Mon Sep 17 00:00:00 2001 From: Laurent Hoss Date: Mon, 26 Aug 2019 10:29:30 +0200 Subject: [PATCH 11/11] update to recent molecule 2.22 stable version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9197db8..d40c512 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ services: before_install: - sudo apt-get -qq update install: - # Need to use the latest molecule 2.22 rc, for compatibility with ansible 2.8.x (provided in the used docker image) - - pip install molecule==2.22rc3 + # molecule version >v2.22 required for compatibility with ansible 2.8.x (provided in the used docker image) + - pip install molecule==2.22 - pip install docker script: - molecule test