Skip to content

Commit

Permalink
Fix failing EULA
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Jan 10, 2025
1 parent 13159d7 commit 5068811
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
3 changes: 3 additions & 0 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
- name: Converge
hosts: all
become: true
pre_tasks:
- name: include vars
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
ansible.builtin.apt:
name: "{{ msodbcsql_dependencies }}"
state: "{{ apt_install_state | default('latest') }}"
environment: "{{ msodbcsql_apt_environment }}"
tags:
- msodbcsql-install-dependencies

- name: install | additional
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

Check failure on line 17 in vars/main.yml

View workflow job for this annotation

GitHub Actions / Lint

17:5 [indentation] wrong indentation: expected 2 but found 4

msodbcsql_dependencies:
- "msodbcsql{{ msodbcsql_version }}"

0 comments on commit 5068811

Please sign in to comment.