Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing EULA #2

Merged
merged 1 commit into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
- name: Converge

Check warning on line 2 in molecule/default/converge.yml

View workflow job for this annotation

GitHub Actions / Lint

role-name[path]

Avoid using paths when importing roles. (../../../)
hosts: all
become: true
pre_tasks:
- name: include vars

Check warning on line 6 in molecule/default/converge.yml

View workflow job for this annotation

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
roles:
- ../../../
10 changes: 2 additions & 8 deletions tasks/install.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
# tasks file
---
- name: install | configure debconf
ansible.builtin.debconf:
name: "{{ item.name }}"
question: "{{ item.question }}"
value: "{{ item.value }}"
vtype: "{{ item.vtype }}"
with_items: "{{ msodbcsql_debconf_selections }}"

- name: install | dependencies

Check warning on line 3 in tasks/install.yml

View workflow job for this annotation

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.apt:
name: "{{ msodbcsql_dependencies }}"
state: "{{ apt_install_state | default('latest') }}"
environment: "{{ msodbcsql_apt_environment }}"
tags:
- msodbcsql-install-dependencies

- name: install | additional

Check warning on line 11 in tasks/install.yml

View workflow job for this annotation

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.apt:
name: "{{ msodbcsql_install }}"
state: "{{ apt_install_state | default('latest') }}"
environment: "{{ msodbcsql_apt_environment }}"
tags:
- msodbcsql-install-additional
3 changes: 3 additions & 0 deletions tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
hosts: localhost
connection: local
become: true
pre_tasks:
- name: include vars
ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
roles:
- ../../
3 changes: 3 additions & 0 deletions tests/vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
hosts: all
remote_user: vagrant
become: true
pre_tasks:
- name: include vars
ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
roles:
- ../../
4 changes: 4 additions & 0 deletions tests/vars/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# vars file
---
msodbcsql_install:
- "mssql-tools{{ msodbcsql_version }}"
11 changes: 2 additions & 9 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,8 @@ msodbcsql_dependencies_pre:
- apt-transport-https
- wget

msodbcsql_debconf_selections:
- name: "msodbcsql{{ msodbcsql_version }}"
question: msodbcsql/ACCEPT_EULA
value: true
vtype: boolean
- name: "mssql-tools{{ msodbcsql_version }}"
question: mssql-tools/ACCEPT_EULA
value: true
vtype: boolean
msodbcsql_apt_environment:
ACCEPT_EULA: Y

msodbcsql_dependencies:
- "msodbcsql{{ msodbcsql_version }}"
Loading