Merge pull request #428 from lnls-sirius/new-deploy

New deploy

inventories/sirius/group_vars/all

@@ -68,14 +68,14 @@ pkg_version_pru_serial: "v1.6.0"
 pkg_version_ps_firmware_c28: "master"
 pkg_version_ps_firmware_arm: "master"
 pkg_version_ethbridge_pru_serial: "v2.9.0"
-pkg_version_siriuspy: "v2.86.0"
+pkg_version_siriuspy: "v2.87.0"
 pkg_version_machine_applications: "v3.47.0"
-pkg_version_siriushla: "v0.100.0"
-pkg_sirius_scripts: "v0.16.0"
+pkg_version_siriushla: "v1.0.0"
+pkg_sirius_scripts: "v0.17.0"
 pkg_version_lnls_ansible: "master"
 
 pkg_version_mathphys: "v2.9.0"
-pkg_version_trackcpp: "v4.10.3"
+pkg_version_trackcpp: "v4.10.4"
 pkg_version_lnls: "v1.4.2"
 pkg_version_pyaccel: "v3.18.1"
 pkg_version_pymodels: "v1.18.1"

make/targets/deploy.mk

@@ -3,12 +3,12 @@
 #
 # Steps of a standard deploy:
 #
-# 1. make deploy-tag-create        # [create deploy tag with timestamp]
-# 2. make deploy-tag-show          # [show timestamp deploy tag created]
-# 3. make deploy-desktops          # [run deploy playbook]
-# 4. make deploy-servers-glusterfs # [run glusterfs playbook]
-# 5. make deploy-fac-docker-images # [run playbook that creates updated docker images]
-# 6. make deploy-tag-lnls-ansible  # [tag deploy version in ansible]
+# 1. make deploy-tag-create                                    # [create deploy tag with timestamp]
+# 2. make deploy-tag-show                                      # [show timestamp deploy tag created]
+# 3. make deploy-desktops  or  make deploy-desktops-siriusapps # [run deploy playbook]
+# 4. make deploy-servers-glusterfs                             # [run glusterfs playbook]
+# 5. make deploy-fac-docker-images                             # [run playbook that creates updated docker images]
+# 6. make deploy-tag-lnls-ansible                              # [tag deploy version in ansible]
 #
 # ps: a) at step 4 docker image files 'fac-apps', 'fac-iocs' and 'fac-csconsts' are
 #        created with deploy tag shown in step 2. (e.x.: fac-iocs:2021-03-17_16-01-12) and
@@ -46,6 +46,10 @@ deploy-desktops: playbooks/playbook-desktops.yml
 	ansible-playbook -u sirius --inventory $(SIRIUS_INVENTORY) --ask-vault-pass -k --ask-become-pass --extra-vars $(ANSIBLE_EXTRA_VARS) \
 		playbooks/playbook-desktops.yml
 
+deploy-desktops-siriusapps: playbooks/playbook-desktops-siriusapps.yml
+	ansible-playbook -u sirius --inventory $(SIRIUS_INVENTORY) --ask-vault-pass -k --ask-become-pass --extra-vars $(ANSIBLE_EXTRA_VARS) \
+		playbooks/playbook-desktops-siriusapps.yml
+
 deploy-fac-docker-images: playbooks/playbook-fac-services-docker-images.yml
 	ansible-playbook -u sirius --inventory $(SIRIUS_INVENTORY) -k --ask-become-pass --extra-vars $(ANSIBLE_EXTRA_VARS) \
 		playbooks/playbook-fac-services-docker-images.yml

playbooks/playbook-desktops-siriusapps.yml

@@ -0,0 +1,18 @@
+---
+- hosts: control_room:control_room_tv:control_room_linac_opis:control_room_new_pcs:con:elp
+  remote_user: sirius
+  become: true
+
+  pre_tasks:
+    - name: Include distribution-dependent variables
+      include_vars: "{{ item }}"
+      vars:
+        possible_var_files:
+          - "../{{ inventory }}/group_vars/{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+          - "../{{ inventory }}/group_vars/{{ ansible_distribution }}.yml"
+          - "../{{ inventory }}/group_vars/{{ ansible_os_family }}.yml"
+      loop: "{{ q('first_found', possible_var_files, errors='ignore') }}"
+
+  roles:
+    - role: lnls-ans-role-sirius-apps
+    - role: lnls-ans-role-sirius-hla

roles/lnls-ans-role-sirius-apps/meta/main.yml

@@ -25,10 +25,10 @@ galaxy_info:
         - xenial
         - bionic
 
-dependencies:
-  - lnls-ans-role-repositories
-  - lnls-ans-role-users
-  - lnls-ans-role-python
-  - lnls-ans-role-epics
-# - lnls-ans-role-qt
-# - lnls-ans-role-pydm
+# dependencies:
+#   - lnls-ans-role-repositories
+#   - lnls-ans-role-users
+#   - lnls-ans-role-python
+#   - lnls-ans-role-epics
+#   - lnls-ans-role-qt
+#   - lnls-ans-role-pydm

roles/lnls-ans-role-sirius-hla/meta/main.yml

@@ -25,10 +25,10 @@ galaxy_info:
         - xenial
         - bionic
 
-dependencies:
-  - lnls-ans-role-repositories
-  - lnls-ans-role-users
-  - lnls-ans-role-python
-  - lnls-ans-role-epics
-# - lnls-ans-role-qt
-# - lnls-ans-role-pydm
+# dependencies:
+#   - lnls-ans-role-repositories
+#   - lnls-ans-role-users
+#   - lnls-ans-role-python
+#   - lnls-ans-role-epics
+#   - lnls-ans-role-qt
+#   - lnls-ans-role-pydm