diff options
| author |   stark, steven <steven.stark@att.com> | 2020-04-21 15:28:13 -0700 |
|---|---|---|
| committer |   Brian Freeman <bf1936@att.com> | 2020-04-23 12:28:48 +0000 |
| commit | d5d74c7ce5f071d2e0417cc3b4b86073fd9b41cc (patch) | |
| tree | 7f58554dcf13054bc8a6f35d90aac68cd3a480b5 /deployment/aks/util | |
| parent | 906480b1b28446660b4a65f249ddf6722fc8b7e6 (diff) | |
[INT] updating aks install w/ master pass
- Also updating openstack cli to py3 to fix import issues
Issue-ID: INT-1557
Signed-off-by: stark, steven <steven.stark@att.com>
Change-Id: I99cbc68614e0fcc8fd0572fd7c44c7cd431b215b
Diffstat (limited to 'deployment/aks/util')
| -rwxr-xr-x | deployment/aks/util/create_integration_override.sh | 3 | ||||
| -rwxr-xr-x | deployment/aks/util/create_openstack_cli.sh | 8 | ||||
| -rwxr-xr-x | deployment/aks/util/create_robot_config.sh | 3 | ||||
| -rw-r--r-- | deployment/aks/util/integration_override.template | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/deployment/aks/util/create_integration_override.sh b/deployment/aks/util/create_integration_override.sh index 15d853918..88c6f9f3b 100755 --- a/deployment/aks/util/create_integration_override.sh +++ b/deployment/aks/util/create_integration_override.sh @@ -22,6 +22,7 @@ DOCKER_REPOSITORY=$4 NFS_IP_ADDR=$5 K8S_01_VM_IP=$6 KUBECONFIG=$7 +MASTER_PASSWORD=$8 . $OPENSTACK_RC @@ -72,4 +73,4 @@ OS_PROJECT_ID=`kubectl exec $OPENSTACK_CLI_POD -- sh -lc "openstack project show echo "export OS_PROJECT_ID=$OS_PROJECT_ID" >> "$OPENSTACK_RC" -$DIR/create_robot_config.sh "$OPENSTACK_RC" "$BUILD_DIR/openstack_params.conf" "$BUILD_DIR" "$DIR/integration_override.template" +$DIR/create_robot_config.sh "$OPENSTACK_RC" "$BUILD_DIR/openstack_params.conf" "$BUILD_DIR" "$DIR/integration_override.template" "$MASTER_PASSWORD" diff --git a/deployment/aks/util/create_openstack_cli.sh b/deployment/aks/util/create_openstack_cli.sh index 01ae88673..8f3f331b3 100755 --- a/deployment/aks/util/create_openstack_cli.sh +++ b/deployment/aks/util/create_openstack_cli.sh @@ -39,14 +39,14 @@ spec: args: - -c - apk update && \ - apk add python && \ - apk add py-pip && \ - apk add python-dev && \ + apk add python3 && \ + apk add py3-pip && \ + apk add python3-dev && \ apk add gcc && \ apk add musl-dev && \ apk add libffi-dev && \ apk add openssl-dev && \ - pip install python-openstackclient && \ + pip3 install python-openstackclient && \ sh -c 'echo ". /openstack/openstack_rc" >> /root/.profile; while true; do sleep 60; done;' restartPolicy: Never volumes: diff --git a/deployment/aks/util/create_robot_config.sh b/deployment/aks/util/create_robot_config.sh index dea67b858..9c1e15e1b 100755 --- a/deployment/aks/util/create_robot_config.sh +++ b/deployment/aks/util/create_robot_config.sh @@ -17,6 +17,7 @@ OPENSTACK_RC=$1 OPENSTACK_PARAM=$2 BUILD_DIR=$3 INTEGRATION_TEMPLATE=$4 +MASTER_PASSWORD=$5 if [ "$OPENSTACK_RC" == "" ] then @@ -71,6 +72,8 @@ sed -ir -e "s/__sec_group__/$OS_SEC_GROUP/" $template sed -ir -e "s/\${OS_UBUNTU_14_IMAGE}/$OS_UBUNTU_14_IMAGE/" $template sed -ir -e "s/\${OS_UBUNTU_16_IMAGE}/$OS_UBUNTU_16_IMAGE/" $template +sed -ir -e "s/\${MASTER_PASSWORD}/$MASTER_PASSWORD/" $template + sed -ir -e "s/__nfs_ip_addr__/$NFS_IP_ADDR/" $template sed -ir -e "s/__k8s_01_vm_ip__/$K8S_01_VM_IP/" $template diff --git a/deployment/aks/util/integration_override.template b/deployment/aks/util/integration_override.template index 5f24824a3..108357d6d 100644 --- a/deployment/aks/util/integration_override.template +++ b/deployment/aks/util/integration_override.template @@ -1,6 +1,7 @@ global: repository: __docker_proxy__ pullPolicy: IfNotPresent + masterPassword: "${MASTER_PASSWORD}" robot: enabled: true flavor: large |