From ab4919f65669c28341812df3400cf98915688b96 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Tue, 9 Jul 2019 16:01:38 -0500 Subject: [PATCH] Correct opendev.org urls Previous commit had some of the urls incorrect Change-Id: Ia36831ebe55014a0ca58f448f934382bd2b27e68 --- multi-node-aio/README.rst | 4 ++-- multi-node-aio/bootstrap.sh | 4 ++-- multi-node-aio/build.sh | 4 ++-- multi-node-aio/playbooks/deploy-elk.yml | 2 +- multi-node-aio/playbooks/deploy-osa.yml | 2 +- multi-node-aio/run_tests.sh | 4 ++-- skydive/tests/functional.yml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/multi-node-aio/README.rst b/multi-node-aio/README.rst index 48e3e716..ffe7b277 100644 --- a/multi-node-aio/README.rst +++ b/multi-node-aio/README.rst @@ -155,10 +155,10 @@ Instruct the VM to use the selected kernel meta package, eg. linux-generic: ``DEFAULT_KERNEL=${DEFAULT_KERNEL:-linux-image-generic}`` Set the OSA repo for this script to retrieve: - ``OSA_REPO=${OSA_REPO:-https://git.opendev.org/openstack/openstack-ansible}`` + ``OSA_REPO=${OSA_REPO:-https://opendev.org/openstack/openstack-ansible}`` Set the openstack-ansible-ops repo to retrieve for the ELK stack: - ``OS_OPS_REPO=${OS_OPS_REPO:-https://git.opendev.org/openstack/openstack-ansible-ops}`` + ``OS_OPS_REPO=${OS_OPS_REPO:-https://opendev.org/openstack/openstack-ansible-ops}`` Set the OSA branch for this script to deploy: ``OSA_BRANCH=${OSA_BRANCH:-master}`` diff --git a/multi-node-aio/bootstrap.sh b/multi-node-aio/bootstrap.sh index 15cbb08b..31d4b8fa 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://git.opendev.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=${OSA_DEPS_BRANCH} +sudo pip install -r https://opendev.org/openstack/openstack-ansible-tests/src/branch/${OSA_DEPS_BRANCH}/test-ansible-deps.txt # Get the latest OSA plugins # This is used to allow access from the MNAIO host to @@ -100,5 +100,5 @@ sudo pip install -r https://git.opendev.org/cgit/openstack/openstack-ansible-tes # do execute things from infra1. mkdir -p ~/.ansible if [[ ! -d ~/.ansible/plugins ]]; then - git clone -b ${OSA_DEPS_BRANCH} https://git.opendev.org/openstack/openstack-ansible-plugins ~/.ansible/plugins + git clone -b ${OSA_DEPS_BRANCH} https://opendev.org/openstack/openstack-ansible-plugins ~/.ansible/plugins fi diff --git a/multi-node-aio/build.sh b/multi-node-aio/build.sh index 05cfd4ed..424317aa 100755 --- a/multi-node-aio/build.sh +++ b/multi-node-aio/build.sh @@ -37,8 +37,8 @@ ansible-playbook -vv \ -e deploy_vms=${DEPLOY_VMS:-"true"} \ -e deploy_osa=${DEPLOY_OSA:-"true"} \ -e deploy_elk=${DEPLOY_ELK:-"false"} \ - -e osa_repo=${OSA_REPO:-"https://git.opendev.org/openstack/openstack-ansible"} \ - -e os_ops_repo=${OS_OPS_REPO:-"https://git.opendev.org/openstack/openstack-ansible-ops"} \ + -e osa_repo=${OSA_REPO:-"https://opendev.org/openstack/openstack-ansible"} \ + -e os_ops_repo=${OS_OPS_REPO:-"https://opendev.org/openstack/openstack-ansible-ops"} \ -e osa_branch=${OSA_BRANCH:-"master"} \ -e os_ops_branch=${OS_OPS_BRANCH:-"master"} \ -e default_network=${DEFAULT_NETWORK:-"eth0"} \ diff --git a/multi-node-aio/playbooks/deploy-elk.yml b/multi-node-aio/playbooks/deploy-elk.yml index a3afd0aa..8076a38e 100644 --- a/multi-node-aio/playbooks/deploy-elk.yml +++ b/multi-node-aio/playbooks/deploy-elk.yml @@ -34,7 +34,7 @@ # Example read-write git checkout from github - name: Get openstack-ansible-ops git: - repo: "{{ os_ops_repo | default('https://git.opendev.org/openstack/openstack-ansible-ops') }}" + repo: "{{ os_ops_repo | default('https://opendev.org/openstack/openstack-ansible-ops') }}" dest: /opt/openstack-ansible-ops version: "{{ os_ops_branch | default('master') }}" force: true diff --git a/multi-node-aio/playbooks/deploy-osa.yml b/multi-node-aio/playbooks/deploy-osa.yml index c71ed909..5da93c00 100644 --- a/multi-node-aio/playbooks/deploy-osa.yml +++ b/multi-node-aio/playbooks/deploy-osa.yml @@ -34,7 +34,7 @@ # Example read-write git checkout from github - name: Get OSA git: - repo: "{{ osa_repo | default('https://git.opendev.org/openstack/openstack-ansible') }}" + repo: "{{ osa_repo | default('https://opendev.org/openstack/openstack-ansible') }}" dest: /opt/openstack-ansible version: "{{ osa_branch | default('master') }}" when: diff --git a/multi-node-aio/run_tests.sh b/multi-node-aio/run_tests.sh index f594f3c1..6864cee5 100755 --- a/multi-node-aio/run_tests.sh +++ b/multi-node-aio/run_tests.sh @@ -15,7 +15,7 @@ # # Note: # This file is maintained in the openstack-ansible-tests repository. -# https://git.opendev.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh +# https://opendev.org/openstack/openstack-ansible-tests/src/branch/master/run_tests.sh # If you need to modify this file, update the one in the openstack-ansible-tests # repository and then update this file as well. The purpose of this file is to # prepare the host and then execute all the tox tests. @@ -49,7 +49,7 @@ install_pkg_deps() { git_clone_repo() { if [[ ! -d "${WORKING_DIR}/tests/common" ]]; then git clone \ - https://git.opendev.org/openstack/openstack-ansible-tests \ + https://opendev.org/openstack/openstack-ansible-tests \ ${WORKING_DIR}/tests/common fi } diff --git a/skydive/tests/functional.yml b/skydive/tests/functional.yml index 66b6d7c2..01248946 100644 --- a/skydive/tests/functional.yml +++ b/skydive/tests/functional.yml @@ -124,7 +124,7 @@ - name: Get the ops repo git: dest: "/opt/openstack-ansible-ops" - repo: https://git.opendev.org/openstack/openstack-ansible-ops + repo: https://opendev.org/openstack/openstack-ansible-ops force: yes track_submodules: yes clone: yes