Merge branch 'release/3.2.0'

alvistack · Jul 8, 2019 · f9959aa · f9959aa
2 parents cea4fb3 + 9d2ab23
commit f9959aa
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,19 @@
 # Ansible Role for Bamboo
 
-## 3.2.0 - TBC
+## 3.3.0 - TBC
+
+### Major Changes
+
+## 3.2.0 - 2019-07-08
 
 ### Major Changes
 
   - Update LXD test profile for Kubernetes v1.15.0 support
-  - Update molecule \>=2.22rc1 for Ansible 2.8.0 support
   - Add dummy tasks and vars placeholder for multi OS support
+  - Fix molecule `group_vars` with links
+  - Replace `with_items` with `loop`
+  - Replace `with_dict` with `var`
+  - Replace `with_first_found` with `lookup('first_found')`
 
 ## 3.1.0 - 2019-06-13
 

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -26,7 +26,7 @@
   service:
     name: "{{ item.name }}"
     state: restarted
-  with_items:
+  loop:
     - { name: "bamboo" }
   changed_when: false
   ignore_errors: true
diff --git a/molecule/centos-7/group_vars/all/main.yml → molecule/centos-7/group_vars/all/all.yml b/molecule/centos-7/group_vars/all/main.yml → molecule/centos-7/group_vars/all/all.yml
diff --git a/molecule/centos-7/molecule.yml b/molecule/centos-7/molecule.yml
@@ -39,6 +39,9 @@ provisioner:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
   lint:
     name: ansible-lint
+  inventory:
+    links:
+      group_vars: group_vars
 verifier:
   name: testinfra
   lint:

diff --git a/molecule/suse-15/group_vars/all/main.yml → molecule/suse-15/group_vars/all/all.yml b/molecule/suse-15/group_vars/all/main.yml → molecule/suse-15/group_vars/all/all.yml
diff --git a/molecule/suse-15/molecule.yml b/molecule/suse-15/molecule.yml
@@ -39,6 +39,9 @@ provisioner:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
   lint:
     name: ansible-lint
+  inventory:
+    links:
+      group_vars: group_vars
 verifier:
   name: testinfra
   lint:

diff --git a/...cule/ubuntu-16.04/group_vars/all/main.yml → molecule/ubuntu-16.04/group_vars/all/all.yml b/...cule/ubuntu-16.04/group_vars/all/main.yml → molecule/ubuntu-16.04/group_vars/all/all.yml
diff --git a/molecule/ubuntu-16.04/molecule.yml b/molecule/ubuntu-16.04/molecule.yml
@@ -39,6 +39,9 @@ provisioner:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
   lint:
     name: ansible-lint
+  inventory:
+    links:
+      group_vars: group_vars
 verifier:
   name: testinfra
   lint:

diff --git a/...cule/ubuntu-18.04/group_vars/all/main.yml → molecule/ubuntu-18.04/group_vars/all/all.yml b/...cule/ubuntu-18.04/group_vars/all/main.yml → molecule/ubuntu-18.04/group_vars/all/all.yml
diff --git a/molecule/ubuntu-18.04/molecule.yml b/molecule/ubuntu-18.04/molecule.yml
@@ -39,6 +39,9 @@ provisioner:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
   lint:
     name: ansible-lint
+  inventory:
+    links:
+      group_vars: group_vars
 verifier:
   name: testinfra
   lint:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -19,32 +19,32 @@
   tags: bamboo
 
 - name: include release specific variables
-  include_vars: "{{ loop_var }}"
-  with_first_found:
-    - files:
+  include_vars: "{{ lookup('first_found', _params) }}"
+  vars:
+    _params:
+      files:
         - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
         - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
         - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
         - "{{ ansible_distribution | lower }}.yml"
         - "{{ ansible_os_family | lower }}.yml"
-      paths: "../vars"
-  loop_control:
-    loop_var: "loop_var"
+      paths:
+        - "../vars"
   ignore_errors: true
   tags: bamboo
 
 - name: include release specific tasks
-  include_tasks: "{{ loop_var }}"
-  with_first_found:
-    - files:
+  include_tasks: "{{ lookup('first_found', _params) }}"
+  vars:
+    _params:
+      files:
         - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
         - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
         - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
         - "{{ ansible_distribution | lower }}.yml"
         - "{{ ansible_os_family | lower }}.yml"
-      paths: "."
-  loop_control:
-    loop_var: "loop_var"
+      paths:
+        - "."
   ignore_errors: true
   tags: bamboo
 
@@ -73,7 +73,7 @@
     group: "{{ item.group | default('root') }}"
     mode: "{{ item.mode | default('0755') }}"
     state: "{{ item.state | default('directory') }}"
-  with_items:
+  loop:
     - { dest: "/etc/init.d" }
     - { dest: "/lib/systemd/system" }
     - { dest: "/opt/atlassian/bamboo", owner: "bamboo", group: "bamboo" }
@@ -87,7 +87,7 @@
     url: "{{ item.url }}"
     dest: "{{ item.dest }}"
     checksum: "{{ item.checksum }}"
-  with_items:
+  loop:
     - "{{ bamboo_download }}"
     - "{{ mysql_jdbc_download }}"
     - "{{ postgresql_jdbc_download }}"
@@ -122,7 +122,7 @@
     owner: "{{ item.owner | default('root') }}"
     group: "{{ item.group | default('root') }}"
     mode: "{{ item.mode | default('0644') }}"
-  with_items:
+  loop:
     - { dest: "/etc/init.d/bamboo", mode: "0755" }
     - { dest: "/lib/systemd/system/bamboo.service" }
     - { dest: "/opt/atlassian/bamboo/bin/setenv.sh", owner: "bamboo", group: "bamboo", mode: "0755" }
@@ -139,7 +139,7 @@
     group: "{{ item.group | default('root') }}"
     mode: "{{ item.mode | default('0644') }}"
     state: "{{ item.state | default('file') }}"
-  with_items:
+  loop:
     - { dest: "/etc/init.d/bamboo", mode: "0755" }
     - { dest: "/lib/systemd/system/bamboo.service" }
     - { dest: "/opt/atlassian/bamboo/bin/setenv.sh", owner: "bamboo", group: "bamboo", mode: "0755" }
@@ -154,7 +154,7 @@
   service:
     name: "{{ item.name }}"
     enabled: true
-  with_items:
+  loop:
     - { name: "bamboo" }
   changed_when: false
   ignore_errors: true