[FUEL-761] Fix tests for Rsync module
Merge pull request #324 from warpc/rsync_spec

[FUEL-761] Fix tests for Rsync module
Fix trailing whitespaces

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Add cirros_version for tests, default 0.3.0

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Fix default url for cirros

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Fix CIRROS_IMAGE to use any cirros version as 'cirros'

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Fix wget syntax

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Move cirros_image from prepare to prepare_tempest

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Add UPGRADE feature was lost after merge

Note: this feature is strongly needed to accomplish FUEL-617
(1.04 Epic: Non-disruptive upgrade of OpenStack versions)

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Undo fix for FUEL-546

net04_ext should be created as non shared, as it was before FUEL-546.

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
For testing internal repos, use IP addresses instead of FQDNs

Implements: #FUEL-785
Workaround for: #FUEL-784

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Merge branch 'undo546'
Merge branch 'feature_upgrade'
Merge branch 'feature_cirros_version'
Merge branch 'wa_fqdn2ip'
Merge branch 'fix_trwhitespaces'

Conflicts:
	deployment/puppet/glance/manifests/api.pp
	deployment/puppet/glance/manifests/registry.pp
	deployment/puppet/openstack/examples/site_openstack_simple.pp
	deployment/puppet/openstack/examples/site_openstack_single.pp
	deployment/puppet/openstack/manifests/controller.pp

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>