Skip to content

Commit

Permalink
Merge pull request #13 from tulibraries/devo-1065-make-rocky8-updates
Browse files Browse the repository at this point in the history
Devo 1065 make rocky8 updates
  • Loading branch information
sensei100 authored May 31, 2024
2 parents 5109992 + 5bbadfd commit e92ae2e
Show file tree
Hide file tree
Showing 9 changed files with 940 additions and 724 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ jobs:
ansible_review:
working_directory: ~/ansible-role-jumphost
docker:
- image: cimg/python:3.7.11
- image: cimg/python:3.12.3
environment:
PIPENV_VENV_IN_PROJECT: true
steps:
- checkout
- run: pipenv install --dev
- setup_remote_docker
- run: sudo apt update; sudo apt install rsync
- run: pipenv run molecule destroy
- run: pipenv run molecule test
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.11
3.12.3
16 changes: 11 additions & 5 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@ verify_ssl = true

[dev-packages]
docker="*"
molecule = "*"
molecule-docker = "*"
pytest = "*"
pytest-testinfra = "*"

[packages]
ansible = "==2.9.20"
cryptography = "==3.3.2"
jinja2 = "==2.11.3"
molecule = "==2.22"
ansible = "==9.6.0"
cryptography = "==42.0.7"
jinja2 = "*"

# Remove once this is fixed: https://github.com/ansible-collections/community.docker/issues/868#issuecomment-2124979976
requests = "==2.31.0"

[requires]
python_version = "3.7"
python_version = "3.12"
1,605 changes: 915 additions & 690 deletions Pipfile.lock

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ galaxy_info:
author: Chad Nelson
company: Temple University Libraries
description: Role to set up ssh_config for jump host on Control Machine
role_name: ansible_role_jumphost
namespace: tulibraries
license: BSD
min_ansible_version: 2.8

platforms:
- name: Centos
- name: rockylinux
versions:
- 7
- 8

galaxy_tags: []

Expand Down
14 changes: 0 additions & 14 deletions molecule/default/Dockerfile.j2

This file was deleted.

File renamed without changes.
15 changes: 5 additions & 10 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
---

dependency:
name: galaxy
lint:
name: yamllint
driver:
name: docker
platforms:
- name: instance
image: centos:7
image: rockylinux:8
cgroupns: host
- name: otherhost
image: centos:7
image: rockylinux:8
cgroupns: host
provisioner:
name: ansible
log: true
inventory:
links:
hosts: inventory

lint:
name: ansible-lint
playbooks:
converge: playbook.yml
verifier:
name: testinfra
lint:
name: flake8
2 changes: 1 addition & 1 deletion molecule/default/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Converge
hosts: main
roles:
- role: ansible-role-jumphost
- role: tulibraries.ansible_role_jumphost
vars:
- jumphost: otherhost
- ansible_user: root

0 comments on commit e92ae2e

Please sign in to comment.