PMM-12641 Optimize PMM build scripts

build/Makefile

@@ -35,7 +35,8 @@ pmm-ami:
 		build -var 'pmm_server_image_name=${PMM_SERVER_IMAGE}' -only amazon-ebs -color=false packer/pmm.json | tee build.log
 ## ----------------- PACKER ------------------
 
-check:                          ## Run required checks and linters
-	ansible-playbook --syntax-check ansible/pmm-docker/update.yml
-	ansible-playbook --check ansible/pmm-docker/update.yml
-	ansible-lint ansible/pmm-docker/update.yml
+check:
+	echo "TODO: Since update.yml has been deprecated, see if other playbooks need to be linted"
+	# ansible-playbook --syntax-check ansible/pmm-docker/update.yml
+	# ansible-playbook --check ansible/pmm-docker/update.yml
+	# ansible-lint ansible/pmm-docker/update.yml

build/ansible/ansible.cfg

@@ -3,6 +3,7 @@
 # Otherwise, it will fail with 'Permission denied' error since the default paths are '/root/.ansible/tmp'
 # Ref: https://github.com/ansible/ansible/blob/stable-2.9/examples/ansible.cfg
 [defaults]
+interpreter_python = /usr/bin/python
 
 remote_tmp     = /tmp
 local_tmp      = /tmp

build/ansible/hosts

@@ -0,0 +1,11 @@
+# This is the default ansible 'hosts' file.
+#
+# It should live in /etc/ansible/hosts
+#
+#   - Comments begin with the '#' character
+#   - Blank lines are ignored
+#   - Groups of hosts are delimited by [header] elements
+#   - You can enter hostnames or ip addresses
+#   - A hostname/ip can be a member of multiple groups
+
+127.0.0.1  ansible_connection=local

build/ansible/pmm-docker/init.yml

@@ -1,6 +1,6 @@
 ---
-# This playbook contains tasks executed during initialization PMM Server
-- hosts: localhost
+# This playbook gets executed by pmm-update-perform-init
+- hosts: all
   become: true
   become_method: su
   become_user: pmm

build/ansible/pmm-docker/main.yml

@@ -2,5 +2,6 @@
 - hosts: all
   become: yes
   gather_facts: yes
+
   roles:
     - pmm-images

build/ansible/pmm/main.yml

@@ -1,6 +1,5 @@
 ---
-# This playbook is frozen after 2.0.0 GA release.
-# All new plays should be added into pmm-update playbook. It is invoked after this one.
+# TODO: Remove as this playbook does not seem to be used anywhere. 
 
 - hosts: all
   become: yes

build/ansible/pmm/post-build-actions.yml → build/ansible/pmm/post-build.yml

@@ -27,25 +27,6 @@
         --server-address=127.0.0.1:8443
         --server-insecure-tls
 
-    - name: Reread supervisord configuration
-      command: supervisorctl reread
-      become: true
-      become_user: pmm
-      become_method: su      
-      register: reread_result
-      changed_when: "'No config updates to processes' not in reread_result.stdout"
-
-    - name: See which service configs changed
-      debug: var=reread_result.stdout_lines
-
-    - name: Stop pmm-managed before deleting the database
-      supervisorctl:
-        name: pmm-managed
-        state: stopped
-      become: true
-      become_user: pmm
-      become_method: su
-
     - name: Remove pmm-managed database
       postgresql_db:
         login_user: postgres
@@ -58,7 +39,7 @@
         name: pmm-managed
         state: absent
 
-    - name: Stop supervisord service for docker
+    - name: Stop supervisord service
       command: supervisorctl shutdown
       become: true
       become_user: pmm
@@ -106,7 +87,7 @@
     # This is due to the way OverlayFS and kernel works. More info https://github.com/moby/moby/issues/25409
     # This step ensures the directory is empty on startup and the contents are recreated.
     # This is not an issue if the folder is in a volume or mounted from the host OS.
-    - name: Recreate /srv/victoriametrics folder
+    - name: Recreate '/srv/victoriametrics' directory
       file:
         state: "{{ item }}"
         path: /srv/victoriametrics
@@ -124,12 +105,3 @@
         owner: pmm
         group: pmm
         mode: 0775
-
-    # nginx needs to be able to write to /var/lib/nginx, but it's owned by root.
-    - name: Change ownership of nginx dirs
-      file:
-        path: /var/lib/nginx
-        state: directory
-        group: pmm
-        owner: pmm
-        recurse: yes