Allow overriding CLI parameter defaults with env files
We've added the ability to override CLI defaults with environment files
[1] but then it got reversed while fixing a related bug [2]. We need to
put this ability back because otherwise we cannot customize
e.g. NeutronDhcpAgentsPerNetwork, or deploy with external Ceph with
custom FSID and key.
As a related change we have to remove hardcoded role counts from
overcloud-env.json, because they'd overwrite the counts passed via
CLI. (Furthermore, having the hardcoded default counts there doesn't
make too much sense now that we have custom roles, the counts should
already be properly defaulted in role_data.yaml.)
[1] Change ID I2722e118abde1cea6210148b16ac1ed3d9f235d8
[2] Change ID I80c663c23dfa27fa7b4ca2bf6b0101c132e5889b
Closes-Bug: #1632683
Change-Id: Iaf0adda44c84fcc552e743e4712d1dcf01daa7e4
(cherry picked from commit 71ebf2a31ecaee96342599c2d14ee5325d6d6413)
Reviewed: https:/ /review. openstack. org/387919 /git.openstack. org/cgit/ openstack/ python- tripleoclient/ commit/ ?id=0b2984f687c 4377b7367cfaf7f 72a25a9bfbb6bd
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit 0b2984f687c4377 b7367cfaf7f72a2 5a9bfbb6bd
Author: Jiri Stransky <email address hidden>
Date: Fri Oct 14 17:15:33 2016 +0200
Allow overriding CLI parameter defaults with env files
We've added the ability to override CLI defaults with environment files tsPerNetwork, or deploy with external Ceph with
[1] but then it got reversed while fixing a related bug [2]. We need to
put this ability back because otherwise we cannot customize
e.g. NeutronDhcpAgen
custom FSID and key.
As a related change we have to remove hardcoded role counts from env.json, because they'd overwrite the counts passed via
overcloud-
CLI. (Furthermore, having the hardcoded default counts there doesn't
make too much sense now that we have custom roles, the counts should
already be properly defaulted in role_data.yaml.)
[1] Change ID I2722e118abde1c ea6210148b16ac1 ed3d9f235d8 fa7b4ca2bf6b010 1c132e5889b
[2] Change ID I80c663c23dfa27
Closes-Bug: #1632683 c552e743e4712d1 dcf01daa7e4 6342599c2d14ee5 325d6d6413)
Change-Id: Iaf0adda44c84fc
(cherry picked from commit 71ebf2a31ecaee9