Add my_zone to ansible tower service template.

[tinaafitz]

Adding my_zone to service_template_ansible_tower enables Ansible Tower Service provisioning to queue work in the provider zone.

https://bugzilla.redhat.com/show_bug.cgi?id=1451473

[tinaafitz]

@miq-bot assign @gmcculloug
@miq-bot add_label bug, providers/ansible_tower, services, fine/yes

[gmcculloug]

I understand the job_template.manager.try(:my_zone) part. Why default to MiqServer.my_zone? What happens if my_zone just returns nil instead?

[tinaafitz]

@gmcculloug If we return nil instead of defaulting to MiqServer.my_zone, the work is put on the queue with a nil zone. I initially thought the service_template_provision_task deliver_to_automate method would catch it, but it only defaults it if the source doesn't respond to my_zone.

determine_queue_zone will leave it as nil because the options key zone exists:
if options.key?(:zone) options[:zone] # return specified zone including nil (aka ANY zone)

[gmcculloug]

You are referring to service_template_provision_task.rb#L146.

I guess my follow-up question would be: Is the service_template valid if there is no manager or if the manager has a nil zone? I do not think it is, therefore I still see value in simplifying this method to job_template.manager.try(:my_zone).

[tinaafitz]

@gmcculloug Good point. Changes made.

[gmcculloug]

This description needs to be updated to match the new functionality.

[tinaafitz]

@gmcculloug Changed description.

[miq-bot]

Checked commit tinaafitz@1d0bb97 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks fine. 🍰

[simaishi]

Fine backport details:

$ git log -1
commit 456b5ac7d409abd5a1010734bb7e161148da821b
Author: Greg McCullough <[email protected]>
Date:   Wed May 31 15:46:47 2017 -0400

    Merge pull request #15233 from tinaafitz/ansible_tower_my_zone
    
    Add my_zone to ansible tower service template.
    (cherry picked from commit e871897e55349892d83a4f52bc8b21d499e3dac6)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1460356