ovirt_vm: Check next_run configuration update if exist

[machacekondra]

Backport of #47280

This PR fixes the update check method so it now check also the next_run
configuration of the virtual machine if it exists.

So if previously the VM was updated with new parameters, and then reset
back, the module didn't set the parameters to be set back in next_run.
This PR fixes it so the next run configuration is set back with proper
parameters.

Signed-off-by: Ondra Machacek omachace@redhat.com
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1639894
Signed-off-by: Ondra Machacek omachace@redhat.com

SUMMARY

ISSUE TYPE

• Bugfix Pull Request
• Docs Pull Request
• Feature Pull Request
• New Module Pull Request

COMPONENT NAME

ANSIBLE VERSION

ADDITIONAL INFORMATION

[ansibot]

Hi @machacekondra, thank you for submitting this pull-request!

click here for bot help

[ansibot]

cc @mwperina
click here for bot help

[mwperina]

shipit

[mwperina]

Ryan, could you please merge? This is a customer related bug, so we would really need to get this into Ansible 2.7.1. Thanks!

@ryansb

[abadger]

Could you add a changelog entry for this? It will be ready to merge once that is added.

[abadger]

@mwperina @machacekondra Also... today is the last day for merging for the 2.7.1 release. So if you can get it in ASAP, that would be extremely helpful for getting it into 2.7.1 as opposed to 2.7.2.

[machacekondra]

@abadger Thanks for review. I've added the changelog.

[mwperina]

shipit

[abadger]

The problem in the changelog is the ": ". In yaml, that has a special meaning, the separator between a dictionary's key and value elements.

The easiest fix is to change the ": " into a " - ".

[ansibot]

The test ansible-test sanity --test changelog [explain] failed with the error:

Command "/usr/bin/python test/sanity/code-smell/changelog.py" returned exit status 1.
>>> Standard Error
Traceback (most recent call last):
  File "packaging/release/changelogs/changelog.py", line 814, in <module>
    main()
  File "packaging/release/changelogs/changelog.py", line 98, in main
    args.func(args)
  File "packaging/release/changelogs/changelog.py", line 109, in command_lint
    lint_fragments(fragments, exceptions)
  File "packaging/release/changelogs/changelog.py", line 227, in lint_fragments
    errors += linter.lint(fragment)
  File "packaging/release/changelogs/changelog.py", line 307, in lint
    errors += [(fragment.path, 0, 0, result[1]) for result in results]
  File "packaging/release/changelogs/changelog.py", line 307, in <listcomp>
    errors += [(fragment.path, 0, 0, result[1]) for result in results]
  File "/usr/local/lib/python3.6/dist-packages/rstcheck.py", line 169, in check
    find_ignored_languages(source)
  File "/usr/local/lib/python3.6/dist-packages/rstcheck.py", line 235, in find_ignored_languages
    for (index, line) in enumerate(source.splitlines()):
AttributeError: 'dict' object has no attribute 'splitlines'
Traceback (most recent call last):
  File "test/sanity/code-smell/changelog.py", line 14, in <module>
    main()
  File "test/sanity/code-smell/changelog.py", line 10, in main
    subprocess.check_call(cmd)
  File "/usr/lib/python3.6/subprocess.py", line 291, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['packaging/release/changelogs/changelog.py', 'lint', 'changelogs/fragments/ovirt_vm_check_next_run_configuration_update_if_exist.yaml']' returned non-zero exit status 1.

click here for bot help

[mwperina]

shipit

[abadger]

There are now conflicts in this PR (after merging other ovirt PRs) If you have a chance to resolve those that would be great. I'll take a look after I run through the backport queue at whether you've had a chance and whether it would be straightforward for me to resolve the conflict myself.

[abadger]

Okay, I'm looking at whether I can resolve the conflicts now.

[machacekondra]

@abadger conflicts resolved

[abadger]

@machacekondra Thanks. github was still telling me there's conflicts, likely because of the merge (as opposed to rebase). But I can see how to fix that thanks to your work. I've pushed up a resolution to that. Please review to be sure I haven't done anything wrong.

[machacekondra]

@abadger Change looks OK, thanks you!

[abadger]

Merged for the 2.7.1 release.