upload_cirros.rb doesn't support hiera override

[Nikita Koshikov]

Because of upload_cirros.rb script doesn't merge hashes, deployment fails if we override/add glance hash.

Steps to reproduce:

1) create file - that overrides glance hash in hiera, in this example:
cat /etc/hiera/override/openstack-region.yaml:
region: region_eu
nova:
  region: region_eu
glance:
  region: region_eu

2) Run task upload_cirros:
ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb

Script is waiting for password promt.
OS Password:

The actual error in astute.log is:
ut=>"", :stderr=>"You must provide a password via either --os-password, env[OS_PASSWORD], or prompted response\nYou must provide a password via either --os-password, env[OS_PASSWORD], or prompte
d response\nYou must provide a password via either --os-password, env[OS_PASSWORD], or prompted response\nYou must provide a password via either --os-password, env[OS_PASSWORD], or prompted resp
onse\nYou must provide a password via either --os-password, env[OS_PASSWORD], or prompted response\n/etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb:79:in `wait_for_glance': Cou
ld not get a list of glance images! (RuntimeError)\n\tfrom /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb:103:in `<main>'\n", :exit_code=>1}}
2015-10-08T12:46:22 debug: [655] dcd4395b-fd25-4e22-8f5a-c62281d248d1: cmd: cd / && ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb
cwd: /
stdout:
stderr: You must provide a password via either --os-password, env[OS_PASSWORD], or prompted response
You must provide a password via either --os-password, env[OS_PASSWORD], or prompted response
You must provide a password via either --os-password, env[OS_PASSWORD], or prompted response
You must provide a password via either --os-password, env[OS_PASSWORD], or prompted response
You must provide a password via either --os-password, env[OS_PASSWORD], or prompted response

 cat /etc/fuel/version.yaml
VERSION:
  feature_groups:
    - mirantis
  production: "docker"
  release: "7.0"
  openstack_version: "2015.1.0-7.0"
  api: "1.0"
  build_number: "301"
  build_id: "301"
  nailgun_sha: "4162b0c15adb425b37608c787944d1983f543aa8"
  python-fuelclient_sha: "486bde57cda1badb68f915f66c61b544108606f3"
  fuel-agent_sha: "50e90af6e3d560e9085ff71d2950cfbcca91af67"
  fuel-nailgun-agent_sha: "d7027952870a35db8dc52f185bb1158cdd3d1ebd"
  astute_sha: "6c5b73f93e24cc781c809db9159927655ced5012"
  fuel-library_sha: "5d50055aeca1dd0dc53b43825dc4c8f7780be9dd"
  fuel-ostf_sha: "2cd967dccd66cfc3a0abd6af9f31e5b4d150a11c"
  fuelmain_sha: "a65d453215edb0284a2e4761be7a156bb5627677"

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/232527

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/232527
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=f578068ed8e08006c057e08b40a8e72d9390a61e
Submitter: Jenkins
Branch: master

commit f578068ed8e08006c057e08b40a8e72d9390a61e
Author: Nikita Koshikov <email address hidden>
Date: Thu Oct 8 16:22:25 2015 +0300

    Add ability merge hashes to upload_cirros task

    Change-Id: I9d7a864253afe635d1fda8c8eb47957c031d7cec
    Closes-bug: #1504128

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/7.0
Review: https://review.openstack.org/233072

[Sergey Novikov (snovikov)]

Verified on MOS 8.0 RC#1

STV(only negative case):

1. Deploy cluster with controller and compute nodes
2. Go to controller node
3. Add /etc/hiera/override/openstack-region.yaml with content:
region: region_eu
nova:
  region: region_eu
glance:
  region: region_eu

4. Add "override/openstack-region" in /etc/hiera.yaml
5. execute
# ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb

Actual and expected result: we should get message "internalURL endpoint for image service in region_eu region not found"

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/376641
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=c56d4e4783f2591136eaf250467aeb38a5f18b89
Submitter: Jenkins
Branch: stable/7.0

commit c56d4e4783f2591136eaf250467aeb38a5f18b89
Author: Maksim Malchuk <email address hidden>
Date: Mon Sep 26 19:58:45 2016 +0300

    Fix syntax errors in the manifests

    Change-Id: I397bbd2142d9b39bbc88e81966aea72bb084b4e7
    Related-Bug: #1619642
    Related-Bug: #1504128
    Signed-off-by: Maksim Malchuk <email address hidden>

[OpenStack Infra (hudson-openstack)]

Change abandoned by Sergii Golovatiuk (<email address hidden>) on branch: stable/7.0
Review: https://review.openstack.org/233072