test/aws: copy criotested cert if it was mounted by CI

inventory/dynamic/gcp/group_vars/all/00_defaults.yml

@@ -20,7 +20,7 @@ openshift_master_cluster_hostname: "internal-openshift-master.{{ public_hosted_z
 openshift_master_cluster_public_hostname: "openshift-master.{{ public_hosted_zone }}"
 openshift_master_default_subdomain: "{{ wildcard_zone }}"
 
-mcd_port: 49500
+mcd_port: 22623
 mcd_endpoint: "https://{{ openshift_master_cluster_public_hostname }}:{{ mcd_port }}"
 
 # Cloud specific settings

playbooks/init/basic_facts.yml

@@ -47,7 +47,7 @@
   hosts: "{{ l_init_fact_hosts | default('nodes') }}:!masters:!bootstrap"
   tasks:
   - set_fact:
-      openshift_bootstrap_endpoint: "https://{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:49500/config/worker"
+      openshift_bootstrap_endpoint: "https://{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:22623/config/worker"
     when:
     - openshift_install_config_path is defined
     - openshift_bootstrap_endpoint is not defined
@@ -56,7 +56,7 @@
   hosts: "{{ l_init_fact_hosts | default('nodes') }}:&masters"
   tasks:
   - set_fact:
-      openshift_bootstrap_endpoint: "https://{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:49500/config/master"
+      openshift_bootstrap_endpoint: "https://{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:22623/config/master"
     when:
     - openshift_install_config_path is defined
     - openshift_bootstrap_endpoint is not defined

roles/container_runtime/tasks/package_crio.yml

@@ -46,11 +46,19 @@
     - /etc/cni/net.d/200-loopback.conf
     - /etc/cni/net.d/100-crio-bridge.conf
 
-- name: Create the CRI-O configuration
-  template:
+- name: Set pause_image to pod image
+  ini_file:
+    dest: /etc/crio/crio.conf
+    section: "crio.image"
+    option: pause_image
+    value: '"{{ openshift_crio_pause_image }}"'
+
+- name: Set pause_command to pod cmd
+  ini_file:
     dest: /etc/crio/crio.conf
-    src: crio.conf.j2
-    backup: yes
+    section: "crio.image"
+    option: pause_command
+    value: ' "/usr/bin/pod"'
 
 - name: Update crictl.yaml runtime-endpoint
   yedit:
@@ -89,6 +97,18 @@
     state: restarted
     daemon_reload: yes
   register: start_result
+  ignore_errors: true
+
+- when: start_result is failed
+  block:
+    - name: Get crio logs
+      command: journalctl --no-pager -u crio
+      register: crio_logs
+      ignore_errors: true
+    - debug:
+        msg: "{{ crio_logs.stdout_lines }}"
+    - fail:
+        msg: crio start failed.
 
 # If we are using crio only, docker.service might not be available for
 # 'docker login'

test/aws/create_machineset.yml

@@ -57,6 +57,9 @@
   - "'items' in new_machine.results.results[0]"
   - "new_machine.results.results[0]['items'] | length > 0"
   - "'status' in new_machine.results.results[0]['items'][0]"
+  - "'providerStatus' in new_machine.results.results[0]['items'][0]['status']"
+  - "'instanceState' in new_machine.results.results[0]['items'][0]['status']['providerStatus']"
+  - "new_machine.results.results[0]['items'][0]['status']['providerStatus']['instanceState'] == 'running'"
 
 - name: add machine to the inventory
   add_host:

test/aws/scaleup.yml

@@ -29,6 +29,14 @@
   tasks:
   - wait_for_connection: {}
   - setup: {}
+  - name: Copy ops-mirror.pem
+    copy:
+      src: ../../inventory/dynamic/injected/ops-mirror.pem
+      dest: /var/lib/yum/ops-mirror.pem
+      owner: root
+      group: root
+      mode: 0644
+    ignore_errors: true
 
 - import_playbook: ../../playbooks/openshift-node/scaleup.yml
 
@@ -92,10 +100,20 @@
       register: crictl_logs_output
       with_items: "{{ crictl_ps_output.stdout_lines }}"
       ignore_errors: true
+    - name: Get crio logs
+      command: journalctl --no-pager -u cri-o
+      register: crio_logs
+      ignore_errors: true
+    - name: Get kubelet logs
+      command: journalctl --no-pager -u kubelet
+      register: kubelet_logs
+      ignore_errors: tru
     - debug:
         var: crictl_logs_output
     - debug:
-        msg: "{{ bootkube_logs.stdout_lines }}"
+        msg: "{{ kubelet_logs.stdout_lines }}"
+    - debug:
+        msg: "{{ crio_logs.stdout_lines }}"
     - fail:
         msg: Node failed to become Ready