Handles {controller,NovaCompute}ExtraConfig deprecation in ovecloud.j2
authorGiulio Fidente <gfidente@redhat.com>
Mon, 17 Jul 2017 08:15:13 +0000 (10:15 +0200)
committerGiulio Fidente <gfidente@redhat.com>
Mon, 17 Jul 2017 09:54:54 +0000 (11:54 +0200)
commit68e582323e8d02638b31575f1c6aa40380cb1d0f
treee269f8bb3132980f475f2dd41bf88c22f224b896
parent8b81b363fd48b0080b963fd2b1ab6bfe97b0c204
Handles {controller,NovaCompute}ExtraConfig deprecation in ovecloud.j2

We missed to parse and merge {controller,NovaCompute}ExtraConfig data
in change [1].

Also fixes whitespaces handling in docker-steps.j2 and
puppet-steps.j2 previously updated by [2].

1. Id37de5864138edd5476c097a8a1f0763faeaf768
2. I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a

Change-Id: Ia9983bc991eb79e479855993c1c8819ddfb52e38
docker/docker-steps.j2
overcloud.j2.yaml
puppet/puppet-steps.j2