Description of problem:

When performing an upgrade from OSP15 to OSP16, the Controllers upgrade step fails with:


TASK [Restart ovn-dbs service (pacemaker)] *************************************
Tuesday 28 April 2020  05:46:19 +0000 (0:00:02.384)       0:00:11.318 ********* 
fatal: [controller-0]: FAILED! => {"msg": "The conditional check 'ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower' failed. The error was: error while evaluating conditional (ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower): 'ovn_dbs_short_bootstrap_node_name' is undefined\n\nThe error appears to be in '/var/lib/mistral/1724455b-7bfb-47ad-98d5-37762b2f0750/Controller/post_upgrade_tasks.yaml': line 6, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n  when: step|int == 1\n- name: Restart ovn-dbs service (pacemaker)\n  ^ here\n"}
fatal: [controller-1]: FAILED! => {"msg": "The conditional check 'ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower' failed. The error was: error while evaluating conditional (ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower): 'ovn_dbs_short_bootstrap_node_name' is undefined\n\nThe error appears to be in '/var/lib/mistral/1724455b-7bfb-47ad-98d5-37762b2f0750/Controller/post_upgrade_tasks.yaml': line 6, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n  when: step|int == 1\n- name: Restart ovn-dbs service (pacemaker)\n  ^ here\n"}
fatal: [controller-2]: FAILED! => {"msg": "The conditional check 'ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower' failed. The error was: error while evaluating conditional (ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower): 'ovn_dbs_short_bootstrap_node_name' is undefined\n\nThe error appears to be in '/var/lib/mistral/1724455b-7bfb-47ad-98d5-37762b2f0750/Controller/post_upgrade_tasks.yaml': line 6, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n  when: step|int == 1\n- name: Restart ovn-dbs service (pacemaker)\n  ^ here\n"}

It looks like the common_deploy_steps_playbooks.yaml isn't been imported for the post_upgrade_tasks as it is being done before running upgrade_tasks:                                                                                                                                   
- import_playbook: common_deploy_steps_playbooks.yaml
  vars:
    deploy_source_host: "Undercloud"
    deploy_target_host: "qe-Cloud-0"

cat post_upgrade_steps_playbook.yaml

- hosts: qe-Cloud-0
  any_errors_fatal: yes
  tasks:
    - include_tasks: post_upgrade_steps_tasks.yaml
      with_sequence: start=0 end=3
      vars:
        bootstrap_server_id: cdb5191f-7598-4345-8a6f-61192da89175
        deploy_identifier: 1588020793
        enable_debug: True
        enable_puppet: True
        container_cli: podman
        container_log_stdout_path: /var/log/containers/stdouts
        container_healthcheck_disabled: False
        docker_puppet_debug: False
        docker_puppet_process_count: 8
        docker_puppet_mount_host_puppet: True
      loop_control:
        loop_var: step


Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1.
2.
3.

Actual results:


Expected results:


Additional info: