Expand package repo conditional logic
Expand package repo conditional logic

This commit updates the conditional logic
used to select package repos.

If the cisco repo is selected, it also now
includes a package repo location.

CiscoSystems/openstack-installer--to-be-replaced-by-puppet_openstack_builder,CiscoSystems/puppet_openstack_builder--to-be-deleted,phchoic/puppet_openstack_builder,CiscoSystems/puppet_openstack_builder--to-be-deleted,CiscoSystems/openstack-installer--to-be-replaced-by-puppet_openstack_builder,michaeltchapman/vagrant-consul,CiscoSystems/openstack-installer--to-be-replaced-by-puppet_openstack_builder,michaeltchapman/puppet_openstack_builder,phchoic/puppet_openstack_builder,phchoic/puppet_openstack_builder,michaeltchapman/puppet_openstack_builder,michaeltchapman/puppet_openstack_builder,CiscoSystems/puppet_openstack_builder--to-be-deleted,CiscoSystems/puppet_openstack_builder,michaeltchapman/vagrant-consul,CiscoSystems/puppet_openstack_builder