Merge pull request #11801 from vrutkovs/mco-image-name

Bug 1737806: Update MCO image name and entrypoint

roles/openshift_node/tasks/apply_machine_config.yml

@@ -39,7 +39,7 @@
     content: "{{ (oc_get.stdout | from_json).spec.config }}"
     dest: "{{ temp_dir.path }}/worker_ignition_config.json"
 
-- name: Get machine-config-daemon image
+- name: Get machine-config-operator image
   command: >
     oc get daemonset machine-config-daemon
     --config={{ openshift_node_kubeconfig_path }}

roles/openshift_node/tasks/config.yml

@@ -83,7 +83,7 @@
   command: "podman pull --tls-verify={{ openshift_node_tls_verify }} --authfile {{ temp_dir.path }}/pull-secret.json {{ l_release_image }}"
 
 - name: Get machine controller daemon image from release image
-  command: "podman run --rm {{ l_release_image }} image machine-config-daemon"
+  command: "podman run --rm {{ l_release_image }} image machine-config-operator"
   register: release_image_mcd
 
 - block:
@@ -93,7 +93,7 @@
   - name: Apply ignition manifest
     command: "podman run {{ podman_mounts }} {{ podman_flags }} {{ mcd_command }}"
     vars:
-      podman_flags: "--privileged --rm -ti {{ release_image_mcd.stdout }}"
+      podman_flags: "--privileged --rm --entrypoint=/usr/bin/machine-config-daemon -ti {{ release_image_mcd.stdout }}"
       podman_mounts: "-v /:/rootfs -v /var/run/dbus:/var/run/dbus -v /run/systemd:/run/systemd"
       mcd_command: "start --node-name {{ ansible_hostname }} --once-from {{ temp_dir.path }}/bootstrap.ign --skip-reboot"