Add Showroom to ARO. Fix linter warnings (#7526)

Co-authored-by: Wolfgang Kulhanek <[email protected]>

ansible/configs/open-environment-azure-subscription/default_vars.yml

@@ -79,8 +79,8 @@ repo_method: satellite
 update_packages: true
 install_common: true
 common_packages_el9:
-  - python39
-  - git
+- python39
+- git
 
 rhel_vm_size: Standard_DS1_v2
 
@@ -103,16 +103,32 @@ rhel_sku: "9_1"
 azure_bastion_rhel_sku: "{{ rhel_sku }}"
 rhel_version: latest
 # Only set plan info if you actually need it
-#rhel_plan_name: ""
-#rhel_plan_publisher: ""
-#rhel_plan_product: ""
+# rhel_plan_name: ""
+# rhel_plan_publisher: ""
+# rhel_plan_product: ""
 
-# ------------------------------------------------------
+# --------------------------------------------------------------------
 # Showroom
-# ------------------------------------------------------
+# --------------------------------------------------------------------
+# Deploy Showroom - if true the showroom_git_* vars need to
+# be set accordingly
 showroom_deploy: false
-ssh_username: "{{ ansible_user }}"
-ssh_password: ""  # must be set in the code, because it's generated_password
-subdomain_base_suffix: "{{ azure_root_dns_zone }}"
-
-deploy_bookbag: false
+# Deploy Showroom to shared cluster
+showroom_deploy_shared_cluster_enable: false
+
+# showroom_git_repo: https://github.com/rhpds/bookbag-aro-mobb.git
+# showroom_git_ref: showroom
+
+# Set a password for the showroom user
+# If not set then a password with given length (default 16 characters)
+# will be created
+# showroom_user_password: ""
+# showroom_user_password_length: 16
+
+# User to log into Showroom (rosa)
+showroom_ssh_username: "{{ bastion_user_name }}"
+showroom_default_ssh_user: "{{ bastion_user_name }}"
+showroom_ssh_method: sshkey     # password | sshkey
+showroom_ssh_key_type: ed25519  # ed25519 | rsa
+# For method = password provide a password
+# showroom_ssh_password: "{{ _showroom_user_password }}"

ansible/configs/open-environment-azure-subscription/destroy_env.yml

@@ -12,11 +12,13 @@
     AZURE_CONFIG_DIR: "{{ azure_config_dir }}"
   tasks:
 
-    - name: Run the azure remove user from subscription ROLE
-      include_role:
-        name: open-env-azure-remove-user-from-subscription
+  - name: Run the azure remove user from subscription ROLE
+    ansible.builtin.include_role:
+      name: open-env-azure-remove-user-from-subscription
 
-    - name: Remove Showroom
-      when: showroom_deploy_shared_cluster_enable | default(false) | bool
-      include_role:
-        name: ocp4_workload_showroom
+  - name: Remove Showroom
+    when: showroom_deploy_shared_cluster_enable | default(false) | bool
+    vars:
+      ACTION: "destroy"
+    ansible.builtin.include_role:
+      name: ocp4_workload_showroom

ansible/configs/open-environment-azure-subscription/infra.yml

@@ -4,19 +4,19 @@
   gather_facts: false
   become: false
   tasks:
-    - debug:
-        msg: "Infra tasks Started {{ subscription_id }}"
+  - ansible.builtin.debug:
+      msg: "Infra tasks Started {{ subscription_id }}"
 
-    - name: Set facts for proper subscription
-      ansible.builtin.set_fact:
-        azure_subscription_id: "{{ subscription_id }}"
-        az_resource_group: "openenv-{{ guid }}"
+  - name: Set facts for proper subscription
+    ansible.builtin.set_fact:
+      azure_subscription_id: "{{ subscription_id }}"
+      az_resource_group: "openenv-{{ guid }}"
 
 # must be indented as is, or fails on "import_playbook has extra params"
 - name: Deploy a bastion, if desired
   when: ( install_aro | default(false) | bool )
     or ( azure_deploy_bastion | default(false) | bool )
-  import_playbook: "../../cloud_providers/azure_infrastructure_deployment.yml"
+  ansible.builtin.import_playbook: "../../cloud_providers/azure_infrastructure_deployment.yml"
   vars:
     azure_subscription_id: "{{ subscription_id }}"
 
@@ -26,5 +26,5 @@
   gather_facts: false
   become: false
   tasks:
-    - debug:
-        msg: "Infra tasks completed successfully"
+  - ansible.builtin.debug:
+      msg: "Infra tasks completed successfully"

ansible/configs/open-environment-azure-subscription/post_infra.yml

@@ -1,12 +1,12 @@
 ---
-- name: Step 000 Post Infrastructure
+- name: Step 003 Post Infrastructure
   hosts: localhost
   connection: local
   become: false
   gather_facts: false
   tags:
-    - step001
-    - post_infrastructure
+  - step003
+  - post_infrastructure
   tasks:
-    - debug:
-        msg: "Step 000 Post Infrastructure - Dummy action"
+  - ansible.builtin.debug:
+      msg: "Step 003 Post Infrastructure - Dummy action"