Bug fixes pr 2.x

install.sh

@@ -18,6 +18,7 @@ usage(){
   /usr/bin/echo '--hostname: the server hostname to set (default: depends on system or provider)'
   /usr/bin/echo '--no-firewall: skip installing iptables with ports 22, 80 and 443 open'
   /usr/bin/echo '--gitlab: install GitLab CE on this server (default: no, set to desired GitLab address to install, e.g. gitlab.example.com)'
+  /usr/bin/echo '--ansible-version: pass an Ansible version string such as <12 for less than version 12 (default: latest)'
   /usr/bin/echo '--letsencrypt: try to create an SSL certificate with LetsEncrypt (requires DNS pointing at this server for provided GitLab URL)'
   /usr/bin/echo '--aws: enable AWS support'
   /usr/bin/echo '--docker: script is running in a Docker container'
@@ -52,6 +53,10 @@ parse_options(){
           shift
           GITLAB_URL="$1"
         ;;
+      "--ansible-version")
+          shift
+          ANSIBLE_VERSION="$1"
+        ;;
       "--letsencrypt")
           LE_SUPPORT="yes"
         ;;
@@ -84,7 +89,7 @@ FIREWALL="true"
 AWS_SUPPORT="false"
 IS_LOCAL="false"
 SERVER_HOSTNAME=$(hostname)
-ANSIBLE_VERSION="<12"
+ANSIBLE_VERSION=""
 
 # Parse options.
 parse_options "$@"

roles/_overrides/tasks/main.yml

@@ -6,7 +6,7 @@
     loop_var: override_file
   when:
     - _overrides.files is defined
-    - _overrides.files | length
+    - _overrides.files|length > 0
 
 - name: Generate links overrides.
   ansible.builtin.include_tasks: link.yml
@@ -15,4 +15,4 @@
     loop_var: override_link
   when:
     - _overrides.links is defined
-    - _overrides.links | length
+    - _overrides.links|length > 0

roles/aws/aws_ami/tasks/main.yml

@@ -17,7 +17,7 @@
     ami_base_image_latest: "{{ ami_base_image.images | sort(attribute='creation_date') | last }}"
   when:
     - ami_base_image.images is defined
-    - ami_base_image.images
+    - ami_base_image.images|length > 0
 
 - name: Delete existing image.
   ansible.builtin.include_tasks: delete.yml

roles/aws/aws_ami/templates/packer.json.j2

@@ -31,7 +31,7 @@
         "owners": ["{{ aws_ami.owner }}"],
         "most_recent": true
       },
-      {% if aws_ami.vpc_filter is defined and aws_ami.vpc_filter | length > 0 %}
+      {% if aws_ami.vpc_filter is defined and aws_ami.vpc_filter|length > 0 %}
       "vpc_filter": {
         "filters": {
           "tag:Name": "{{ aws_ami.vpc_filter }}"
@@ -53,7 +53,7 @@
       "playbook_file": "{{ aws_ami.playbook_file }}",
       "inventory_directory": "{{ _ce_provision_base_dir }}/hosts",
       "ssh_authorized_key_file": "/home/{{ user_provision.username }}/.ssh/{{ aws_ami.public_key_name }}",
-      {% if aws_ami.groups is defined and aws_ami.groups | length %}
+      {% if aws_ami.groups is defined and aws_ami.groups|length > 0 %}
       "groups": {{ aws_ami.groups | to_json }},
       {% endif %}
       "ansible_env_vars":
@@ -68,7 +68,7 @@
         {% if ansible_verbosity >= 1 %}
         "-vvvv",
         {% endif %}
-        {% if _aws_ami_extra_vars is defined and _aws_ami_extra_vars | length %}
+        {% if _aws_ami_extra_vars is defined and _aws_ami_extra_vars|length > 0 %}
         "--extra-vars",
         "{{ _aws_ami_extra_vars }}",
         {% endif %}

roles/aws/aws_cloudfront_distribution/tasks/add_cf_function.yml

@@ -7,7 +7,7 @@
 
 - name: Setting previous command output into variable.
   ansible.builtin.set_fact:
-    _acc_id: "{{ _acc_id.stdout | from_json }}"
+    _acc_id: "{{ _acc_id.stdout }}"
 
 - name: Get CloudFront info.
   ansible.builtin.shell: "aws cloudfront get-distribution-config --id {{ _aws_cloudfront_distribution.id }} --output json > /tmp/dist-config.json"