add wetty terminal values (#7366)

* add wetty terminal values * make sure I'm using the right showroom template demo * argo based multi-user wetty OK
redhat-cop · Nov 15, 2023 · 0155715 · 0155715
1 parent 654c722
commit 0155715
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/ansible/roles_ocp_workloads/ocp4_workload_showroom/defaults/main.yaml b/ansible/roles_ocp_workloads/ocp4_workload_showroom/defaults/main.yaml
@@ -9,7 +9,7 @@ ocp4_workload_showroom_name: "showroom"
 ocp4_workload_showroom_namespace: "showroom-{{ guid | default('00') }}"
 ocp4_workload_showroom_namespace_display: Showroom Guide
 
-ocp4_workload_showroom_content_git_repo: "https://github.com/rhpds/showroom_default_template.git"
+ocp4_workload_showroom_content_git_repo: "https://github.com/rhpds/showroom_template_default.git"
 
 ocp4_workload_showroom_deployer_chart_repo_url: "https://github.com/rhpds/showroom-deployer"
 ocp4_workload_showroom_deployer_chart_repo_revision: "main"
@@ -18,7 +18,6 @@ ocp4_workload_showroom_deployer_chart_version: '0.2.0'
 
 ocp4_workload_showroom_image_name: "showroom-{{ guid | default('00') }}"
 
-
 ocp4_workload_showroom_chart_url:
   "https://github.com/rhpds/showroom-deployer/releases/download/\
   showroom-{{ ocp4_workload_showroom_deployer_chart_version }}/\

diff --git a/ansible/roles_ocp_workloads/ocp4_workload_showroom/tasks/deploy-showroom.yaml b/ansible/roles_ocp_workloads/ocp4_workload_showroom/tasks/deploy-showroom.yaml
@@ -19,6 +19,14 @@
         value_type: "string"
       - value: "content.repoUrl={{ ocp4_workload_showroom_content_git_repo }}"
         value_type: "string"
+      - value: "terminal.wetty.sshAuth=password"
+        value_type: "string"
+      - value: "terminal.wetty.sshHost={{ _showroom_user_data.bastion_public_hostname }}"
+        value_type: "string"
+      - value: "terminal.wetty.sshUser={{ _showroom_user_data.bastion_ssh_user_name }}"
+        value_type: "string"
+      - value: "terminal.wetty.sshPass={{ _showroom_user_data.bastion_ssh_password }}"
+        value_type: "string"
   register: r_helm_templates
 
 - name: Render unto kuberntes the helm manifests

diff --git a/ansible/roles_ocp_workloads/ocp4_workload_showroom/templates/application.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_showroom/templates/application.yaml.j2
@@ -14,8 +14,8 @@ spec:
     server: 'https://kubernetes.default.svc'
   project: default
   syncPolicy:
-    syncOptions:
-    - CreateNamespace=true
+    # syncOptions:
+    # - CreateNamespace=true
     automated:
       prune: true
       selfHeal: true
@@ -26,12 +26,18 @@ spec:
     helm:
       values: |
         namespace:
-          create: false
+          create: true
           name: {{ ocp4_workload_showroom_namespace }}
         deployer:
           domain: {{ _deployer_domain }}
         general:
           guid: {{ guid }}
+        terminal:
+          wetty:
+            sshAuth: password
+            sshHost: {{ _showroom_user_data.bastion_public_hostname }}
+            sshPass: {{ _showroom_user_data.bastion_ssh_password }}
+            sshUser: {{ _showroom_user_data.bastion_ssh_user_name }}
         content:
           repoUrl: {{ ocp4_workload_showroom_content_git_repo }}
           user_data: |-

diff --git a/ansible/roles_ocp_workloads/ocp4_workload_showroom/templates/applicationset.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_showroom/templates/applicationset.yaml.j2
@@ -27,8 +27,8 @@ spec:
         server: 'https://kubernetes.default.svc'
       project: default
       syncPolicy:
-        syncOptions:
-        - CreateNamespace=true
+        # syncOptions:
+        # - CreateNamespace=true
         automated:
           prune: true
           selfHeal: true
@@ -39,12 +39,18 @@ spec:
         helm:
           values: |
             namespace:
-              create: false
+              create: true
               name: "{{ ocp4_workload_showroom_namespace }}-{% raw %}{{.user}}{% endraw %}"
             deployer:
               domain: {{ _deployer_domain }}
             general:
               guid: {{ guid }}
+            terminal:
+              wetty:
+                sshAuth: password
+                sshPass: {{ _showroom_user_data.bastion_ssh_password }}
+                sshHost: {{ _showroom_user_data.bastion_public_hostname }}
+                sshUser: {{ _showroom_user_data.bastion_ssh_user_name }}
             content:
               repoUrl: {{ ocp4_workload_showroom_content_git_repo }}
               user_data: |