diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c14fbf2..19dbecb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,4 @@ --- -# This workflow requires a GALAXY_API_KEY secret present in the GitHub -# repository or organization. -# -# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy -# See: https://github.com/ansible/galaxy/issues/46 - name: release on: @@ -17,24 +11,31 @@ defaults: working-directory: 'nephelaiio.growfs' jobs: - release: name: release runs-on: ubuntu-latest steps: - - name: Check out the codebase. - uses: actions/checkout@v2 + - name: Check out the codebase + uses: actions/checkout@v3 with: path: 'nephelaiio.growfs' - - name: Set up Python 3. - uses: actions/setup-python@v2 + - name: set up Python 3 + uses: actions/setup-python@v4 with: python-version: '3.x' - - name: Install Ansible. - run: pip3 install ansible-base + - name: Update ubuntu repositories + run: sudo apt-get update + + - name: Install make + run: sudo apt-get install -y make + + - name: Install dependencies + run: make install - - name: Trigger a new import on Galaxy. - run: >- - ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo $GITHUB_REPOSITORY | cut -d/ -f1) $(echo $GITHUB_REPOSITORY | cut -d/ -f2) + - name: Trigger a new import on galaxy + run: make publish + env: + GALAXY_API_KEY: "${{ secrets.GALAXY_API_KEY }}" + GITHUB_REPOSITORY: "${{ github.repository }}" diff --git a/.talismanrc b/.talismanrc index db366b9..f315c9b 100644 --- a/.talismanrc +++ b/.talismanrc @@ -1,4 +1,8 @@ fileignoreconfig: +- filename: .github/workflows/release.yml + ignore_detectors: [filecontent] +- filename: pyproject.toml + ignore_detectors: [filecontent] - filename: poetry.lock ignore_detectors: [filecontent] - filename: tasks/lvm.yml diff --git a/molecule/debian/molecule.yml b/molecule/debian/molecule.yml index 3d5b03e..e701eb7 100644 --- a/molecule/debian/molecule.yml +++ b/molecule/debian/molecule.yml @@ -45,7 +45,7 @@ provisioner: molecule_libvirt_netaddr: "{{ lookup('env', 'MOLECULE_NET', default='192.168.247.0/24') | ansible.utils.ipv4('network/prefix') }}" molecule_libvirt_netsize: "{{ molecule_libvirt_netaddr | ansible.utils.ipaddr('prefix') }}" molecule_libvirt_address: "{{ molecule_libvirt_netaddr | ansible.utils.nthhost(1) }}/{{ molecule_libvirt_netsize }}" - molecule_libvirt_network: "molecule" + molecule_libvirt_network: "growfs" molecule_libvirt_path: "/var/lib/libvirt/growfs" molecule_install_dir: "{{ lookup('env', 'MOLECULE_OUTPUT_DIR', default='/tmp/logs') }}" molecule_kvm_keypair: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/kvm_key" diff --git a/poetry.lock b/poetry.lock index d6f3bdd..cae2eb7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -733,6 +733,23 @@ files = [ {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, ] +[[package]] +name = "passlib" +version = "1.7.4" +description = "comprehensive password hashing framework supporting over 30 schemes" +optional = false +python-versions = "*" +files = [ + {file = "passlib-1.7.4-py2.py3-none-any.whl", hash = "sha256:aa6bca462b8d8bda89c70b382f0c298a20b5560af6cbfa2dce410c0a2fb669f1"}, + {file = "passlib-1.7.4.tar.gz", hash = "sha256:defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04"}, +] + +[package.extras] +argon2 = ["argon2-cffi (>=18.2.0)"] +bcrypt = ["bcrypt (>=3.1.0)"] +build-docs = ["cloud-sptheme (>=1.10.1)", "sphinx (>=1.6)", "sphinxcontrib-fulltoc (>=1.2.0)"] +totp = ["cryptography"] + [[package]] name = "pathspec" version = "0.12.1" @@ -1202,4 +1219,4 @@ dev = ["doc8", "flake8", "flake8-import-order", "rstcheck[sphinx]", "sphinx"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "7c0ee4e905a738cdc40f2a408698d8fb799a3f36d32478ad79d40282805041ca" +content-hash = "f7c5aaf35077bbed79228c88a28896126a633600336f3071e483f3b5e1e20f73" diff --git a/pyproject.toml b/pyproject.toml index c6103aa..ffda5e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,7 @@ netaddr = "^0.9.0" yamllint = "^1.32.0" libvirt-python = "^9.8.0" lxml = "^5.1.0" +passlib = "^1.7.4" [build-system] requires = ["poetry-core"]