diff options
| author |   Victor Morales <v.morales@samsung.com> | 2020-11-11 20:52:09 -0500 |
|---|---|---|
| committer |   Rihab Banday <rihab.banday@ericsson.com> | 2020-11-12 13:14:46 +0000 |
| commit | 41dc0ffba7c09220626c8397589871063495c0f2 (patch) | |
| tree | 95541e45f82933a67375119d16ae3e8506272be1 | |
| parent | 1fa1c47f4878370418cb3ad627c7704fbe4b9534 (diff) | |
Fix linting issues
This change fixes some linting issues accumulated from previous
patchsets and ignored by the CI jobs.
Signed-off-by: Victor Morales <v.morales@samsung.com>
Change-Id: I0bf2e67aee786505e9c01570d4d8d99df62b1f9f
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/71377
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Tested-by: Georg Kunz <georg.kunz@ericsson.com>
Reviewed-by: Georg Kunz <georg.kunz@ericsson.com>
Reviewed-by: Michael Pedersen <michaelx.pedersen@intel.com>
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .rstcheck.cfg | 3 | ||||
| -rwxr-xr-x | functions.sh | 19 | ||||
| -rw-r--r-- | playbooks/roles/bmra-config/tasks/main.yaml | 1 |
4 files changed, 14 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e502b35..fecf145 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,4 @@ +--- # GitLab CI config file to deploy RI2 on baremetal infra # and run RC2 compliance tests on the deployed platform. # TODO add tox jobs diff --git a/.rstcheck.cfg b/.rstcheck.cfg new file mode 100644 index 0000000..a9cf023 --- /dev/null +++ b/.rstcheck.cfg @@ -0,0 +1,3 @@ +[rstcheck] +report=warning +ignore_substitutions=today diff --git a/functions.sh b/functions.sh index aa9bf68..fd19c46 100755 --- a/functions.sh +++ b/functions.sh @@ -133,19 +133,18 @@ EOF # Setup networking on provisioned hosts (Adapt setup_network.sh according to your network setup) setup_network() { -# Set Upper limit of number nodes in RI2 cluster (starting from 0) -NODE_MAX_ID=$(($(yq r "$CURRENTPATH"/hw_config/"$VENDOR"/idf.yaml --length idf.kubespray.hostnames)-1)) - -for idx in $(seq 0 "$NODE_MAX_ID") -do - NODE_IP=$(get_host_pxe_ip "nodes[${idx}]") -# SSH to jumphost - # shellcheck disable=SC2087 - ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF + # Set Upper limit of number nodes in RI2 cluster (starting from 0) + NODE_MAX_ID=$(($(yq r "$CURRENTPATH"/hw_config/"$VENDOR"/idf.yaml --length idf.kubespray.hostnames)-1)) + + for idx in $(seq 0 "$NODE_MAX_ID"); do + NODE_IP=$(get_host_pxe_ip "nodes[${idx}]") + # SSH to jumphost + # shellcheck disable=SC2087 + ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF ssh -o StrictHostKeyChecking=no root@${NODE_IP} \ 'bash -s' < ${PROJECT_ROOT}/${VENDOR}/setup_network.sh EOF -done + done } # k8s Provisioning (currently BMRA) diff --git a/playbooks/roles/bmra-config/tasks/main.yaml b/playbooks/roles/bmra-config/tasks/main.yaml index 19b011a..e7d8df9 100644 --- a/playbooks/roles/bmra-config/tasks/main.yaml +++ b/playbooks/roles/bmra-config/tasks/main.yaml @@ -1,3 +1,4 @@ +--- - name: write BMRA config template: src: "inventory.ini" |