From 3191e3b93d4999f474f9d47f3508627e8e8868da Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 10 Jul 2019 15:24:26 -0500 Subject: [PATCH] Use raw url for pip deps Use the raw url to fix pip install and correct error on build parameter. Change-Id: I927bb7a720a67cc8ce9074f3d7d4540ee1699c67 --- multi-node-aio/bootstrap.sh | 2 +- multi-node-aio/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multi-node-aio/bootstrap.sh b/multi-node-aio/bootstrap.sh index 31d4b8fa..1bfe3fd0 100755 --- a/multi-node-aio/bootstrap.sh +++ b/multi-node-aio/bootstrap.sh @@ -92,7 +92,7 @@ if [[ ${#BINDEP_PKGS} > 0 ]]; then fi # Install latest OSA supported Ansible version -sudo pip install -r https://opendev.org/openstack/openstack-ansible-tests/src/branch/${OSA_DEPS_BRANCH}/test-ansible-deps.txt +sudo pip install -r https://opendev.org/openstack/openstack-ansible-tests/raw/branch/${OSA_DEPS_BRANCH}/test-ansible-deps.txt # Get the latest OSA plugins # This is used to allow access from the MNAIO host to diff --git a/multi-node-aio/build.sh b/multi-node-aio/build.sh index 424317aa..634c2411 100755 --- a/multi-node-aio/build.sh +++ b/multi-node-aio/build.sh @@ -59,7 +59,7 @@ ansible-playbook -vv \ -e loadbalancer_vm_server_ram=${LOADBALANCER_VM_SERVER_RAM:-"2048"} \ -e logging_vm_server_ram=${LOGGING_VM_SERVER_RAM:-"2048"} \ -e swift_vm_server_ram=${SWIFT_VM_SERVER_RAM:-"2048"} \ - -e enable_ceph_storage=${ENABLE_CEPH_STORAGE=-"false"} \ + -e enable_ceph_storage=${ENABLE_CEPH_STORAGE:-"false"} \ -e container_tech=${CONTAINER_TECH:-"lxc"} \ -e ipxe_kernel_base_url=${IPXE_KERNEL_BASE_URL:-"http://boot.ipxe.org"} \ -e ipxe_path_url=${IPXE_PATH_URL:-""} ${MNAIO_ANSIBLE_PARAMETERS} \