Merge pull request #741 from abhishek-sa1/devel

Issue #740: AWX hostname fix

control_plane/roles/collect_node_info/vars/main.yml

@@ -22,4 +22,4 @@ file_perm: '0644'
 host_username: root
 host_added_msg: "Added host to awx inventory: "
 host_unreachable_msg: "Following hosts are unreachable: "
-awx_search_key: awx
+awx_search_key: "-job-"

control_plane/roles/provision_idrac/vars/main.yml

@@ -38,7 +38,7 @@ missing_exports_fail_msg: "Failed. Missing network cidr entry of iDRAC IP in /et
 lc_check_fail_msg: "Failed. LC is not ready. Retry again after LC is ready"
 provision_skip_msg: "Skipping remaining tasks for already provisioned servers. To provision server again remove iDRAC IP from the provision_idrac_inventory in awx"
 missing_ip_file_fail_msg: "Failed. Missing management_station_ip.txt in provision_idrac/files folder. Please run control_plane.yml to create management_station_ip.txt"
-awx_search_key: "awx-"
+awx_search_key: "-job-"
 nfs_check_key: "Failed"
 nfs_check_file: "nfs_check.xml"
 provisioned_idrac_inventory_name: "provisioned_idrac_inventory"

roles/cluster_validation/tasks/main.yml

@@ -43,7 +43,7 @@
         control_plane_status: true
       when:
         - not awx_version_check.failed
-        - '"awx-" in awx_hostname.stdout'
+        - awx_search_key in awx_hostname.stdout
 
     - name: Set NFS node status
       set_fact:

roles/cluster_validation/vars/main.yml

@@ -13,6 +13,9 @@
 #  limitations under the License.
 ---
 
+# Usage: main.yml
+awx_search_key: "-job-"
+
 # Usage: fetch_password.yml
 config_filename: "omnia_config.yml"
 config_vaultname: .omnia_vault_key
@@ -63,4 +66,4 @@ powervault_group: "powervault_me4"
 login_vars_filename: input_params/login_vars.yml
 vault_filename: input_params/.login_vault_key
 vault_file_perm: '0644'
-ipa_secret_file: "{{ playbook_dir }}/control_plane/roles/control_plane_security/files/.ipavars.yml"
+ipa_secret_file: "{{ playbook_dir }}/control_plane/roles/control_plane_security/files/.ipavars.yml"