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 | |
| 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')
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 11 | ||||
| -rw-r--r-- | jjb/global/installer-params.yml | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index f18f054a5..bb79dacbe 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -51,14 +51,15 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}" -if [[ ${INSTALLER_TYPE} == 'fuel' && ! -z ${SALT_MASTER_IP} ]]; then - HOST_ARCH=$(ssh -l ubuntu ${SALT_MASTER_IP} -i ${SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ - "sudo salt 'cmp*' grains.get cpuarch --out yaml |awk '{print \$2; exit}'") - envs="${envs} -e POD_ARCH=${HOST_ARCH}" +ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + +if [ "${INSTALLER_TYPE}" == 'fuel' ] && [ "$BRANCH" != 'stable/danube' ]; then + COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ + "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" fi if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-ha'* ]]; then - ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" openo_msb_port=${openo_msb_port:-80} openo_msb_endpoint="$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \ 'mysql -ucompass -pcompass -Dcompass -e "select package_config from cluster;" \ 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' |