majic-ansible-roles Changeset

Changeset - 8f3635c67934

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Branko Majic (branko) - 6 years ago 2018-05-20 19:39:22
branko@majic.rs

MAR-129: Minor preparation for updating Ansible version:

- Ignore the pytest_cache directory in Git.
- Updated Ansible to latest 2.3.x version in requirements file.
- Make sure the SSH client private keys have correct permissions when
testing the backup_server role (must be 0600), otherwise we get
errors from SSH due to insecure permissions during testing.
- Updated test for testing installed packages in the wsgi_website
Python virtual environment to test against up-to-date
packages. Might be nice to fix this one with something less hacky in
the long run.

4 files changed with 38 insertions and 20 deletions:

.gitignore

requirements.txt

roles/backup_server/molecule/default/prepare.yml

roles/wsgi_website/molecule/default/tests/test_parameters_optional.py

0 comments (0 inline, 0 general)

.gitignore

➞

Show inline comments

 *.pyc
 *~
 .pytest_cache/
 tmp/
 docs/_build/
 testsite/preseed_files/

requirements.txt

➞

Show inline comments

@@ @@ -5,58 +5,63 @@ @@
 #    pip-compile --output-file requirements.txt requirements.in
+#
 ansible-lint==3.4.17      # via molecule
-ansible==2.3.2.0
+ansible==2.3.3.0
 anyconfig==0.9.1          # via molecule
 arrow==0.10.0             # via jinja2-time
 asn1crypto==0.23.0        # via cryptography
 arrow==0.12.1             # via jinja2-time
 asn1crypto==0.24.0        # via cryptography
 attrs==18.1.0             # via pytest
 backports.functools-lru-cache==1.5  # via arrow
 bcrypt==3.1.4             # via paramiko
 binaryornot==0.4.4        # via cookiecutter
-cffi==1.11.2              # via bcrypt, cryptography, pynacl
+cffi==1.11.5              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via binaryornot
 click-completion==0.2.1   # via molecule
-click==6.7                # via click-completion, cookiecutter, git-url-parse, molecule, pip-tools, python-gilt
 click==6.7                # via click-completion, cookiecutter, molecule, pip-tools, python-gilt
 colorama==0.3.7           # via molecule, python-gilt
 configparser==3.5.0       # via flake8
 cookiecutter==1.5.1       # via molecule
-cryptography==2.1.3       # via paramiko
+cryptography==2.2.2       # via paramiko
 dnspython==1.15.0
 enum34==1.1.6             # via cryptography, flake8
 fasteners==0.14.1         # via python-gilt
 first==2.0.1              # via pip-tools
 flake8==3.3.0             # via molecule
 funcsigs==1.0.2           # via pytest
 future==0.16.0            # via cookiecutter
-git-url-parse==1.0.2      # via python-gilt
+git-url-parse==1.1.0      # via python-gilt
 idna==2.6                 # via cryptography
-ipaddress==1.0.18         # via cryptography
+ipaddress==1.0.22         # via cryptography
 jinja2-time==0.2.0        # via cookiecutter
 jinja2==2.9.6             # via ansible, click-completion, cookiecutter, jinja2-time, molecule
 markupsafe==1.0           # via jinja2
 marshmallow==2.13.5       # via molecule
 mccabe==0.6.1             # via flake8
 molecule==2.4.0
 monotonic==1.4            # via fasteners
 paramiko==2.4.0
 pathspec==0.5.5           # via yamllint
 monotonic==1.5            # via fasteners
 more-itertools==4.1.0     # via pytest
 paramiko==2.4.1
 pathspec==0.5.6           # via yamllint
 pbr==3.0.1                # via git-url-parse, molecule, python-gilt
 pexpect==4.2.1            # via molecule
 pip-tools==1.10.1
 pip-tools==2.0.2
 pluggy==0.6.0             # via pytest
 poyo==0.4.1               # via cookiecutter
 psutil==5.2.2             # via molecule
 ptyprocess==0.5.2         # via pexpect
 py==1.5.2                 # via pytest
 pyasn1==0.3.7             # via paramiko
 py==1.5.3                 # via pytest
 pyasn1==0.4.2             # via paramiko
 pycodestyle==2.3.1        # via flake8
 pycparser==2.18           # via cffi
 pycrypto==2.6.1           # via ansible
 pyflakes==1.5.0           # via flake8
 pynacl==1.2.0             # via paramiko
 pytest==3.2.5             # via testinfra
 python-dateutil==2.6.1    # via arrow
 pynacl==1.2.1             # via paramiko
 pytest==3.5.1             # via testinfra
 python-dateutil==2.7.3    # via arrow
 python-gilt==1.1.0        # via molecule
 python-vagrant==0.5.15
 pyyaml==3.12              # via ansible, ansible-lint, molecule, python-gilt, yamllint
 sh==1.12.14               # via molecule, python-gilt
-six==1.11.0               # via ansible-lint, bcrypt, click-completion, cryptography, fasteners, git-url-parse, pip-tools, pynacl, python-dateutil, testinfra
+six==1.11.0               # via ansible-lint, bcrypt, click-completion, cryptography, fasteners, more-itertools, pip-tools, pynacl, pytest, python-dateutil, testinfra
 tabulate==0.7.7           # via molecule
 testinfra==1.7.1          # via molecule
 tree-format==0.1.1        # via molecule

roles/backup_server/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -5,6 +5,18 @@ @@
   gather_facts: False
   tasks:
 - hosts: localhost
   connection: local
   tasks:
     - name: Fix SSH client file permissions locally, otherwise we get error from SSH
       file:
         path: "{{ item }}"
         mode: g=,o=
       with_items:
         - tests/data/ssh/client1
         - tests/data/ssh/client2
 - hosts: all
   become: yes
   tasks:

roles/wsgi_website/molecule/default/tests/test_parameters_optional.py

➞

Show inline comments

@@ @@ -258,8 +258,8 @@ dnspython==1.15.0 @@
 docopt==0.6.2
 futures==3.1.0
 gunicorn==19.7.0
 jedi==0.11.0
 parso==0.1.0
 jedi==0.12.0
 parso==0.2.0
 prompt-toolkit==1.0.15
 ptpython==0.41
 six==1.11.0

0 comments (0 inline, 0 general)