Removes --deploy-config cli option
Closes-bug: #1618864 Change-Id: I44dd700ac7d7621328a537f484d0bcaa2746b05e
This commit is contained in:
parent
f07f74cc52
commit
b1fd7b49ed
|
@ -36,7 +36,9 @@ There are three config locations, which the CCP CLI uses:
|
|||
#. ``Global defaults`` - fuel_ccp/resources/defaults.yaml in ``fuel-ccp`` repo.
|
||||
#. ``Component defaults`` - service/files/defaults.yaml in each component repo.
|
||||
#. ``Global config`` - Optional. Set path to this config via
|
||||
"--deploy-config /path" CCP CLI arg.
|
||||
"--config-file /path" CCP CLI arg. Otherwise ``fuel-ccp`` will try to find
|
||||
config in next locations: ~.ccp.yaml, ~/.ccp/ccp.yaml, /etc/ccp.yaml,
|
||||
/etc/ccp/ccp.yaml
|
||||
|
||||
Before deployment, CCP will merge all these files into one dict, using the
|
||||
order above, so "component defaults" will override "global defaults" and
|
||||
|
|
|
@ -37,10 +37,6 @@ def get_global_parameters(*config_groups):
|
|||
paths.append(os.path.join(CONF.repositories.path, component,
|
||||
"service/files/defaults.yaml"))
|
||||
|
||||
# And finaly we add cluster-wide globals conf, if provided.
|
||||
if CONF.deploy_config:
|
||||
paths.append(CONF.deploy_config)
|
||||
|
||||
for path in paths:
|
||||
if os.path.isfile(path):
|
||||
LOG.debug("Adding parameters from \"%s\"", path)
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
DEFAULTS = {
|
||||
'deploy_config': None,
|
||||
'action': {
|
||||
'components': None,
|
||||
'dry_run': False,
|
||||
|
@ -10,7 +9,6 @@ DEFAULTS = {
|
|||
}
|
||||
|
||||
SCHEMA = {
|
||||
'deploy_config': {'anyOf': [{'type': 'string'}, {'type': 'null'}]},
|
||||
'action': {
|
||||
'type': 'object',
|
||||
'additionalProperties': False,
|
||||
|
|
Loading…
Reference in New Issue