diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-10 21:34:32 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-11 17:57:50 +0000 |
commit | cad161204a2d64f94be574f27fed92ac24c059ca (patch) | |
tree | a3f367426a1024513e76199065dd7d619be819af /jjb/global | |
parent | a8e3451b433586b477fbe2eb939848bf97a430f4 (diff) |
fuel, armband: Remove SALT_MASTER_IP param
Fuel@OPNFV mcpcontrol network (equiv to old admin/PXE net) has been
configured to use 192.168.10.0/24 during E release cycle.
However, due to overlapping with Ericsson-pod1 networks, we decided
to re-use the old CIDR Fuel used before E release (10.20.0.0/24).
This allows reusing the INSTALLER_IP param instead of recently added
SALT_MASTER_IP param.
Current change refactors all usage of SALT_MASTER_IP in favor of old
INSTALLER_IP, thus reducing complexity and providing a familiar env
to leagcy Fuel users.
JIRA: FUEL-285
Change-Id: I1e89cca08ce4cb9bf3a82a06043c91ee26aa0794
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'jjb/global')
-rw-r--r-- | jjb/global/installer-params.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index b64a41e91..8c01a9f1f 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -39,10 +39,6 @@ default: '10.20.0.2' description: 'IP of the installer' - string: - name: SALT_MASTER_IP - default: '192.168.10.100' - description: 'IP of the salt master (for mcp deployments)' - - string: name: SSH_KEY default: "/var/lib/opnfv/mcp.rsa" description: 'Path to private SSH key to access environment nodes' |