diff --git a/.ansible-lint b/.ansible-lint index 5285a71..07fb90d 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,6 +1,8 @@ +--- skip_list: # Skip the pipefail rule (306) due to controversy / there-be-dragons # https://github.com/ansible/ansible-lint/issues/497 # https://github.com/ansible/ansible/issues/12903 - - '306' - - '106' + - risky-shell-pipe + - role-name + - yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1fea35..233ff8b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: python-version: '3.x' - name: Install test dependencies. - run: pip3 install yamllint ansible-lint + run: pip3 install yamllint ansible ansible-lint - name: Lint code. run: | @@ -32,6 +32,7 @@ jobs: name: Molecule runs-on: ubuntu-latest strategy: + fail-fast: false matrix: distro: - centos8 @@ -57,7 +58,7 @@ jobs: python-version: '3.x' - name: Install test dependencies. - run: pip3 install molecule[docker,lint,test] + run: pip3 install ansible molecule[docker,lint,test] - name: Run Molecule tests. run: molecule test diff --git a/.gitignore b/.gitignore index f497764..28237b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .idea .project -.pyproject \ No newline at end of file +.pyproject +venv +.cache diff --git a/defaults/main.yml b/defaults/main.yml index 60ff067..68019fa 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,6 +6,6 @@ python: "{{ ansible_python_interpreter | default( ansible_python.executable | de pip: "{{ ( ansible_python.version_info[0] == 3 ) | ternary('pip3', 'pip') }}" pip_proxy: '' -pip_download_url_current: https://bootstrap.pypa.io/get-pip.py -pip_download_url_py26: https://bootstrap.pypa.io/2.6/get-pip.py +pip_download_url_current: https://bootstrap.pypa.io/pip/3.5/get-pip.py +pip_download_url_py26: https://bootstrap.pypa.io/pip/2.6/get-pip.py pip_download_url: "{{ ansible_python.version_info[:3]|join('.') is version_compare('2.7', '>=') | ternary( pip_download_url_current, pip_download_url_py26 ) }}" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..4ad5926 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +molecule[lint,docker,test] +ansible +ansible-lint +yamllint