Kaynağa Gözat

Issue #245: Name of the git cloned directory should be retrieved dynamically

Signed-off-by: sakshiarora13 <sakshi_aroa1@dell.com>
John Lockman 4 yıl önce
ebeveyn
işleme
8984ae0a80

+ 2 - 0
.github/workflows/ansible-lint.yml

@@ -33,6 +33,8 @@ jobs:
           /github/workspace/platforms/jupyterhub.yml
           /github/workspace/platforms/jupyterhub.yml
           /github/workspace/platforms/kubeflow.yml
           /github/workspace/platforms/kubeflow.yml
           /github/workspace/tools/install_tools.yml
           /github/workspace/tools/install_tools.yml
+          /github/workspace/tools/intel_tools.yml
+          /github/workspace/tools/olm.yml
         # [optional]
         # [optional]
         # Arguments to override a package and its version to be set explicitly.
         # Arguments to override a package and its version to be set explicitly.
         # Must follow the example syntax.
         # Must follow the example syntax.

+ 10 - 10
appliance/roles/web_ui/tasks/awx_configuration.yml

@@ -30,7 +30,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ organizations_list.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ organizations_list.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 - name: Project list
 - name: Project list
   block:
   block:
@@ -44,7 +44,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ projects_list.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ projects_list.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 - name: Inventory list
 - name: Inventory list
   block:
   block:
@@ -58,7 +58,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ inventory_list.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ inventory_list.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 - name: Credential list
 - name: Credential list
   block:
   block:
@@ -72,7 +72,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ credentials_list.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ credentials_list.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 - name: Template List
 - name: Template List
   block:
   block:
@@ -86,7 +86,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ job_templates_list.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ job_templates_list.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 - name: Group names
 - name: Group names
   block:
   block:
@@ -100,7 +100,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ groups_list.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ groups_list.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 - name: Schedules list
 - name: Schedules list
   block:
   block:
@@ -114,7 +114,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ schedules_list.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ schedules_list.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 # Delete Default Configurations
 # Delete Default Configurations
 - name: Delete default configurations
 - name: Delete default configurations
@@ -154,7 +154,7 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ register_error.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ register_error.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"
 
 
 # Create required configuration if not present
 # Create required configuration if not present
 - name: Create required configurations
 - name: Create required configurations
@@ -171,7 +171,7 @@
       command: >-
       command: >-
         awx --conf.host "{{ awx_ip }}" --conf.username "{{ awx_user }}" --conf.password "{{ admin_password }}"
         awx --conf.host "{{ awx_ip }}" --conf.username "{{ awx_user }}" --conf.password "{{ admin_password }}"
         projects create --name "{{ project_name }}" --organization "{{ organization_name }}"
         projects create --name "{{ project_name }}" --organization "{{ organization_name }}"
-        --local_path "{{ dir_name }}"
+        --local_path "{{ role_path.split('/')[-4] }}"
       when: project_name not in projects_list.stdout
       when: project_name not in projects_list.stdout
       register: register_error
       register: register_error
       no_log: True
       no_log: True
@@ -281,4 +281,4 @@
   rescue:
   rescue:
     - name: Message
     - name: Message
       fail:
       fail:
-        msg: "{{ register_error.stderr | regex_replace(awx_user) | regex_replace(admin_password) }}"
+        msg: "{{ register_error.stdout | regex_replace(awx_user) | regex_replace(admin_password) }}"

+ 0 - 1
appliance/roles/web_ui/vars/main.yml

@@ -51,7 +51,6 @@ default_org: Default
 default_template: 'Demo Job Template'
 default_template: 'Demo Job Template'
 default_projects: 'Demo Project'
 default_projects: 'Demo Project'
 default_credentials: 'Demo Credential'
 default_credentials: 'Demo Credential'
-dir_name: omnia
 organization_name: DellEMC
 organization_name: DellEMC
 project_name: omnia
 project_name: omnia
 omnia_inventory_name: omnia_inventory
 omnia_inventory_name: omnia_inventory

+ 1 - 1
tools/intel_tools.yml

@@ -31,7 +31,7 @@
       state: present
       state: present
 
 
 # Install the Intel Cluster Checker
 # Install the Intel Cluster Checker
-- hosts: cluster 
+- hosts: cluster
   tasks:
   tasks:
   - name: Import the Intel(R) Cluster Checker Repo GPG Key
   - name: Import the Intel(R) Cluster Checker Repo GPG Key
     rpm_key:
     rpm_key:

+ 21 - 0
tools/olm.yml

@@ -0,0 +1,21 @@
+#  Copyright 2020 Dell Inc. or its subsidiaries. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+---
+# olm.yml: Install Operator Lifecycle Manager (OLM) for Operator Framework
+
+- name: Deploy Operator Lifecycle Manager (OLM) CRDs
+  command: kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/crds.yaml
+
+- name: Deploy Operator Lifecycle Manager (OLM)
+  command: kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/olm.yaml