all build issues addressed

harshavardhana · harshavardhana · commit d8905cab9637 · 2021-12-01T02:56:32.000-08:00
diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
@@ -30,5 +30,5 @@ jobs:
       run: |
         sudo apt install python-is-python3 --yes
         python -m pip install --upgrade pip setuptools
-        python -m pip install tox
+        python -m pip install tox ansible
         tox
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ tests/__pycache__/
 
 *.retry
 .tox
+*.log
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -4,10 +4,11 @@
 minio_server_bin: /usr/local/bin/minio
 minio_client_bin: /usr/local/bin/mc
 
-# MinIO release to install. default if latest
-minio_server_release: "RELEASE.2020-08-18T19-41-00Z"
+# MinIO release to install.
+minio_server_release: "RELEASE.2021-11-24T23-19-33Z"
 
-minio_client_release: "RELEASE.2020-08-20T00-23-01Z"
+# MinIO client release to install.
+minio_client_release: "RELEASE.2021-11-16T20-37-36Z"
 
 # Runtime user and group for the MinIO server service
 minio_user: minio
@@ -17,18 +18,18 @@ minio_group: minio
 minio_server_envfile: /etc/default/minio
 
 # Directory to store minio config. Will default to minio_user/.minio if not defined
-minio_config_dir: ""
+minio_config_dir: "/etc/minio"
 
 # Minio server ip/fqdn and port. This makes up the server_addr below
 minio_server_ip: ""
-minio_server_port: "9091"
+minio_server_port: "9000"
 
 # MinIO server listen address
 minio_server_addr: "{{ minio_server_ip }}:{{ minio_server_port}}"
 
 # MinIO console addr:
 minio_console_ip: ""
-minio_console_port: ""
+minio_console_port: "9001"
 minio_console_addr: "{{ minio_console_ip }}:{{ minio_console_port }}"
 
 # MinIO server data directories
@@ -42,15 +43,15 @@ minio_server_args:
 
 # Additional environment variables to be set in minio server environment
 minio_server_env_extra: |
-  MINIO_REGION_NAME=us-east-1
+  MINIO_REGION_NAME=""
 
 # Additional MinIO server CLI options
 minio_server_opts: ""
 
 # MinIO root username password
 # Reading existing values from deprecated access and secret key varibles
-minio_root_username: "{{ minio_access_key | default('minio') }}"
-minio_root_password: "{{ minio_secret_key | default('minio123') }}"
+minio_root_username: "{{ minio_access_key | default('minioadmin') }}"
+minio_root_password: "{{ minio_secret_key | default('minioadmin') }}"
 
 # Switches to enable/disable the MinIO server and/or MinIO client installation.
 minio_install_server: true
diff --git a/meta/main.yml b/meta/main.yml
@@ -1,5 +1,7 @@
 galaxy_info:
   author: Andrea Tosatto
+  role_name: myname
+  namespace: mynamespace
   description: Install and configure the MinIO S3 compatible object storage server on RHEL/CentOS and Debian/Ubuntu
   min_ansible_version: 2.9
   license: MIT
diff --git a/molecule/alternative/converge.yml b/molecule/alternative/converge.yml
@@ -5,7 +5,7 @@
   roles:
     - ansible-minio
   vars:
-    minio_server_envfile: "/opt/minio"
+    minio_server_envfile: "/etc/default/minio"
     minio_server_addr: ":80"
     minio_server_datadirs:
       - "/srv/data1"
diff --git a/molecule/alternative/molecule.yml b/molecule/alternative/molecule.yml
@@ -15,8 +15,8 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: minio-ubuntu-20.04
-    image: paulfantom/ubuntu-molecule:20.04
+  - name: minio-ubuntu-18.04
+    image: paulfantom/ubuntu-molecule:18.04
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/molecule/alternative/playbook.yml b/molecule/alternative/playbook.yml
@@ -5,7 +5,7 @@
   roles:
     - ansible-minio
   vars:
-    minio_server_envfile: "/opt/minio"
+    minio_server_envfile: "/etc/default/minio"
     minio_server_addr: ":80"
     minio_server_datadirs:
       - "/srv/data1"
diff --git a/molecule/alternative/tests/test_minio_alternative.py b/molecule/alternative/tests/test_minio_alternative.py
@@ -10,16 +10,16 @@
 
 @pytest.fixture()
 def AnsibleDefaults():
-    with open('../../defaults/main.yml', 'r') as stream:
+    with open('defaults/main.yml', 'r') as stream:
         return yaml.load(stream)
 
 
 def test_minio_server_env_file(host, AnsibleDefaults):
 
-    f = host.file('/opt/minio')
+    f = host.file('/etc/default/minio')
     assert f.is_file
     assert f.exists
-    assert f.user == 'root'
+    assert f.user == AnsibleDefaults['minio_user']
     assert f.group == AnsibleDefaults['minio_group']
     assert oct(f.mode) == '0o640'
 
diff --git a/molecule/cluster/converge.yml b/molecule/cluster/converge.yml
@@ -5,7 +5,7 @@
   roles:
     - ansible-minio
   vars:
-    minio_server_envfile: "/opt/minio"
+    minio_server_envfile: "/etc/default/minio"
     minio_server_datadirs:
       - "/data1"
       - "/data2"
diff --git a/molecule/cluster/molecule.yml b/molecule/cluster/molecule.yml
@@ -15,8 +15,8 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: minio-ubuntu-20.04
-    image: paulfantom/ubuntu-molecule:20.04
+  - name: minio-ubuntu-18.04
+    image: paulfantom/ubuntu-molecule:18.04
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/molecule/cluster/playbook.yml b/molecule/cluster/playbook.yml
@@ -5,7 +5,7 @@
   roles:
     - ansible-minio
   vars:
-    minio_server_envfile: "/opt/minio"
+    minio_server_envfile: "/etc/default/minio"
     minio_server_datadirs:
       - "/data1"
       - "/data2"
diff --git a/molecule/cluster/tests/test_minio_cluster.py b/molecule/cluster/tests/test_minio_cluster.py
@@ -10,7 +10,7 @@
 
 @pytest.fixture()
 def AnsibleDefaults():
-    with open('../../defaults/main.yml', 'r') as stream:
+    with open('defaults/main.yml', 'r') as stream:
         return yaml.load(stream)
 
 
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -15,8 +15,8 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: minio-ubuntu-20.04
-    image: paulfantom/ubuntu-molecule:20.04
+  - name: minio-ubuntu-18.04
+    image: paulfantom/ubuntu-molecule:18.04
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/molecule/default/tests/test_minio_default.py b/molecule/default/tests/test_minio_default.py
@@ -10,7 +10,7 @@
 
 @pytest.fixture()
 def AnsibleDefaults():
-    with open('../../defaults/main.yml', 'r') as stream:
+    with open('defaults/main.yml', 'r') as stream:
         return yaml.load(stream)
 
 
@@ -22,8 +22,8 @@ def test_minio_installed(host, AnsibleDefaults, minio_bin_var):
 
     f = host.file(AnsibleDefaults[minio_bin_var])
     assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
+    assert f.user == AnsibleDefaults['minio_user']
+    assert f.group == AnsibleDefaults['minio_group']
     assert oct(f.mode) == '0o755'
 
 
@@ -39,5 +39,10 @@ def test_minio_server_data_directories(host, AnsibleDefaults):
 
 
 def test_minio_server_webserver(host):
+    
+    host.socket('tcp://127.0.0.1:9000').is_listening
 
-    host.socket('tcp://127.0.0.1:9091').is_listening
+def test_minio_console_webserver(host):
+    
+    host.socket('tcp://127.0.0.1:9001').is_listening
+    
diff --git a/molecule/resources/create.yml b/molecule/resources/create.yml
@@ -2,7 +2,7 @@
 - name: Create
   hosts: localhost
   vars:
-    ansible_python_interpreter: /usr/bin/python   
+    ansible_python_interpreter: /usr/bin/python3
   connection: local
   gather_facts: false
   no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
diff --git a/molecule/resources/destroy.yml b/molecule/resources/destroy.yml
@@ -2,7 +2,7 @@
 - name: Destroy
   hosts: localhost
   vars:
-    ansible_python_interpreter: /usr/bin/python
+    ansible_python_interpreter: /usr/bin/python3
   connection: local
   gather_facts: false
   no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
diff --git a/molecule/resources/prepare.yml b/molecule/resources/prepare.yml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: true
   vars:
-    ansible_python_interpreter: /usr/bin/python
+    ansible_python_interpreter: /usr/bin/python3
   tasks:
     - name: Install ansible support packages
       package:
diff --git a/tasks/install-client.yml b/tasks/install-client.yml
@@ -18,8 +18,8 @@
   get_url:
     url: "{{ _minio_client_download_url }}"
     dest: "{{ minio_client_bin }}"
-    owner: "root"
-    group: "root"
+    owner: "{{ minio_user }}"
+    group: "{{ minio_group }}"
     mode: 0755
     checksum: "sha256:{{ _minio_client_download_url }}.sha256sum"
   register: _download_client
diff --git a/tasks/install-server.yml b/tasks/install-server.yml
@@ -49,8 +49,8 @@
   get_url:
     url: "{{ _minio_server_download_url }}"
     dest: "{{ minio_server_bin }}"
-    owner: "root"
-    group: "root"
+    owner: "{{ minio_user }}"
+    group: "{{ minio_group }}"
     mode: 0755
     checksum: "sha256:{{ _minio_server_download_url }}.sha256sum"
   register: _download_server
@@ -63,7 +63,7 @@
   template:
     src: minio.env.j2
     dest: "{{ minio_server_envfile }}"
-    owner: "root"
+    owner: "{{ minio_user }}"
     group: "{{ minio_group }}"
     mode: 0640
   notify: restart minio
@@ -72,8 +72,8 @@
   template:
     src: minio.service.j2
     dest: "/etc/systemd/system/minio.service"
-    owner: "root"
-    group: "root"
+    owner: "{{ minio_user }}"
+    group: "{{ minio_group }}"
   when: ansible_service_mgr == "systemd"
   notify:
     - reload minio systemd
@@ -83,8 +83,8 @@
   template:
     src: minio.init.j2
     dest: "/etc/init.d/minio"
-    owner: "root"
-    group: "root"
+    owner: "{{ minio_user }}"
+    group: "{{ minio_group }}"
     mode: 0750
   when: ansible_service_mgr != "systemd"
   notify: restart minio
@@ -100,5 +100,5 @@
 - name: Enable and start the MinIO service
   service:
     name: minio
-    state: started
     enabled: true
+    state: started
diff --git a/templates/minio.env.j2 b/templates/minio.env.j2
@@ -2,15 +2,17 @@
 
 # MinIO local/remote volumes.
 {% if minio_server_args | length > 0 %}
-MINIO_ARGS="{{ minio_server_args | join(' ') }}"
+MINIO_VOLUMES="{{ minio_server_args | join(' ') }}"
 {% endif %}
-# MinIO cli options.
+
+# MinIO CLI options.
 MINIO_OPTS="--address {{ minio_server_addr }} {{ minio_server_opts }}"
 
 {% if minio_root_username %}
 # Root User of the server.
 MINIO_ROOT_USER="{{ minio_root_username }}"
 {% endif %}
+
 {% if minio_root_password %}
 # Root Password of the server.
 MINIO_ROOT_PASSWORD="{{ minio_root_password }}"
diff --git a/templates/minio.service.j2 b/templates/minio.service.j2
@@ -7,22 +7,15 @@ Wants=network-online.target
 After=network-online.target
 AssertFileIsExecutable={{ minio_server_bin }}
 
-# Avoid noisy crashloops
-StartLimitIntervalSec=60
-StartLimitBurst=5
-
 [Service]
 WorkingDirectory=/usr/local/
 
 User={{ minio_user }}
 Group={{ minio_group }}
 
-PermissionsStartOnly=true
-
-EnvironmentFile={{ minio_server_envfile }}
-ExecStartPre=/bin/bash -c "[ -n \"${MINIO_ARGS}\" ] || echo \"Variable MINIO_ARGS not set in {{ minio_server_envfile }}\""
-
-ExecStart={{ minio_server_bin }} server $MINIO_OPTS $MINIO_ARGS
+EnvironmentFile=-{{ minio_server_envfile }}
+ExecStartPre=/bin/bash -c "if [ -z \"${MINIO_VOLUMES}\" ]; then echo \"Variable MINIO_VOLUMES not set in {{ minio_server_envfile }}\"; exit 1; fi"
+ExecStart={{ minio_server_bin }} server $MINIO_OPTS $MINIO_VOLUMES
 
 # Let systemd always restart this service, in limits defined by StartLimitIntervalSec and StartLimitBurst.
 Restart=always
@@ -33,19 +26,13 @@ StandardError=inherit
 # Specifies the maximum file descriptor number that can be opened by this process
 LimitNOFILE=65536
 
-# Disable timeout logic and wait until process is stopped
-TimeoutStopSec=0
-
-# SIGTERM signal is used to stop MinIO
-KillSignal=SIGTERM
-
-SendSIGKILL=no
-
-SuccessExitStatus=0
+# Specifies the maximum number of threads this process can create
+TasksMax=infinity
 
 {% if (minio_server_addr.split(':')[-1] | int) < 1024 %}
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 {% endif %}
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -2,5 +2,5 @@ molecule>=3.1.0
 molecule[docker]
 docker
 requests
-ansible-lint>=3.4.0
+ansible-lint>=5.0.4
 testinfra>=1.7.0

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,4 @@ tests/__pycache__/`
`8`	`8`
`9`	`9`	`*.retry`
`10`	`10`	`.tox`
	`11`	`+*.log`