Correct opendev.org urls

Previous commit had some of the urls incorrect

Change-Id: Ia36831ebe55014a0ca58f448f934382bd2b27e68
This commit is contained in:
Antony Messerli 2019-07-09 16:01:38 -05:00
parent 87cbdd6649
commit ab4919f656
7 changed files with 11 additions and 11 deletions

View File

@ -155,10 +155,10 @@ Instruct the VM to use the selected kernel meta package, eg. linux-generic:
``DEFAULT_KERNEL=${DEFAULT_KERNEL:-linux-image-generic}`` ``DEFAULT_KERNEL=${DEFAULT_KERNEL:-linux-image-generic}``
Set the OSA repo for this script to retrieve: 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: 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: Set the OSA branch for this script to deploy:
``OSA_BRANCH=${OSA_BRANCH:-master}`` ``OSA_BRANCH=${OSA_BRANCH:-master}``

View File

@ -92,7 +92,7 @@ if [[ ${#BINDEP_PKGS} > 0 ]]; then
fi fi
# Install latest OSA supported Ansible version # 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 # Get the latest OSA plugins
# This is used to allow access from the MNAIO host to # 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. # do execute things from infra1.
mkdir -p ~/.ansible mkdir -p ~/.ansible
if [[ ! -d ~/.ansible/plugins ]]; then 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 fi

View File

@ -37,8 +37,8 @@ ansible-playbook -vv \
-e deploy_vms=${DEPLOY_VMS:-"true"} \ -e deploy_vms=${DEPLOY_VMS:-"true"} \
-e deploy_osa=${DEPLOY_OSA:-"true"} \ -e deploy_osa=${DEPLOY_OSA:-"true"} \
-e deploy_elk=${DEPLOY_ELK:-"false"} \ -e deploy_elk=${DEPLOY_ELK:-"false"} \
-e osa_repo=${OSA_REPO:-"https://git.opendev.org/openstack/openstack-ansible"} \ -e osa_repo=${OSA_REPO:-"https://opendev.org/openstack/openstack-ansible"} \
-e os_ops_repo=${OS_OPS_REPO:-"https://git.opendev.org/openstack/openstack-ansible-ops"} \ -e os_ops_repo=${OS_OPS_REPO:-"https://opendev.org/openstack/openstack-ansible-ops"} \
-e osa_branch=${OSA_BRANCH:-"master"} \ -e osa_branch=${OSA_BRANCH:-"master"} \
-e os_ops_branch=${OS_OPS_BRANCH:-"master"} \ -e os_ops_branch=${OS_OPS_BRANCH:-"master"} \
-e default_network=${DEFAULT_NETWORK:-"eth0"} \ -e default_network=${DEFAULT_NETWORK:-"eth0"} \

View File

@ -34,7 +34,7 @@
# Example read-write git checkout from github # Example read-write git checkout from github
- name: Get openstack-ansible-ops - name: Get openstack-ansible-ops
git: 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 dest: /opt/openstack-ansible-ops
version: "{{ os_ops_branch | default('master') }}" version: "{{ os_ops_branch | default('master') }}"
force: true force: true

View File

@ -34,7 +34,7 @@
# Example read-write git checkout from github # Example read-write git checkout from github
- name: Get OSA - name: Get OSA
git: 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 dest: /opt/openstack-ansible
version: "{{ osa_branch | default('master') }}" version: "{{ osa_branch | default('master') }}"
when: when:

View File

@ -15,7 +15,7 @@
# #
# Note: # Note:
# This file is maintained in the openstack-ansible-tests repository. # 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 # 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 # 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. # prepare the host and then execute all the tox tests.
@ -49,7 +49,7 @@ install_pkg_deps() {
git_clone_repo() { git_clone_repo() {
if [[ ! -d "${WORKING_DIR}/tests/common" ]]; then if [[ ! -d "${WORKING_DIR}/tests/common" ]]; then
git clone \ git clone \
https://git.opendev.org/openstack/openstack-ansible-tests \ https://opendev.org/openstack/openstack-ansible-tests \
${WORKING_DIR}/tests/common ${WORKING_DIR}/tests/common
fi fi
} }

View File

@ -124,7 +124,7 @@
- name: Get the ops repo - name: Get the ops repo
git: git:
dest: "/opt/openstack-ansible-ops" dest: "/opt/openstack-ansible-ops"
repo: https://git.opendev.org/openstack/openstack-ansible-ops repo: https://opendev.org/openstack/openstack-ansible-ops
force: yes force: yes
track_submodules: yes track_submodules: yes
clone: yes clone: yes