Replace git.openstack.org URLs with opendev.org URLs

Change-Id: I4edf3307be5a2d668306efa33c0ab55f6867d8a6
This commit is contained in:
zhulingjie 2019-04-23 16:41:16 +08:00 committed by jacky06
parent 29e25e6e29
commit 55e7a787a7
5 changed files with 13 additions and 13 deletions

View File

@ -16,7 +16,7 @@ To run Monasca Log Management in DevStack, do the following three steps.
1. Clone the DevStack repo.
```
git clone https://git.openstack.org/openstack-dev/devstack
git clone https://opendev.org/openstack/devstack
```
2. Add the following to the DevStack local.conf file in the root of the devstack directory. You may
@ -52,8 +52,8 @@ MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-influxdb}
# MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-vertica}
# This line will enable all of Monasca.
enable_plugin monasca-api https://git.openstack.org/openstack/monasca-api
enable_plugin monasca-log-api https://github.com/openstack/monasca-log-api.git
enable_plugin monasca-api https://opendev.org/openstack/monasca-api
enable_plugin monasca-log-api https://opendev.org/openstack/monasca-log-api.git
```
3. Run './stack.sh' from the root of the devstack directory.

10
devstack/Vagrantfile vendored
View File

@ -28,8 +28,8 @@ Vagrant.configure(2) do |config|
sudo apt-get -y install git
if [ $http_proxy ]; then
git config --global url.https://git.openstack.org/.insteadOf https://git.openstack.org/
sudo git config --global url.https://git.openstack.org/.insteadOf https://git.openstack.org/
git config --global url.https://opendev.org/.insteadOf https://opendev.org/
sudo git config --global url.https://opendev.org/.insteadOf https://opendev.org/
protocol=`echo $http_proxy | awk -F: '{print $1}'`
host=`echo $http_proxy | awk -F/ '{print $3}' | awk -F: '{print $1}'`
@ -54,7 +54,7 @@ Vagrant.configure(2) do |config|
sudo cp ./maven_proxy_settings.xml /root/.m2/settings.xml
fi
git clone https://git.openstack.org/openstack-dev/devstack --branch master --depth 1
git clone https://opendev.org/openstack/devstack --branch master --depth 1
cd devstack
echo '[[local|localrc]]
@ -113,8 +113,8 @@ MONASCA_METRICS_DB=${MONASCA_METRICS_DB:-influxdb}
# MONASCA_LOG_API_USE_MOD_WSGI=True
# Uncomment one of the following lines and modify accordingly to enable the Monasca DevStack Plugin
enable_plugin monasca-api https://git.openstack.org/openstack/monasca-api.git
enable_plugin monasca-log-api https://git.openstack.org/openstack/monasca-log-api.git
enable_plugin monasca-api https://opendev.org/openstack/monasca-api.git
enable_plugin monasca-log-api https://opendev.org/openstack/monasca-log-api.git
' > local.conf
./stack.sh

View File

@ -1,5 +1,5 @@
ARG DOCKER_IMAGE=monasca/log-api
ARG APP_REPO=https://git.openstack.org/openstack/monasca-log-api
ARG APP_REPO=https://opendev.org/openstack/monasca-log-api
# Branch, tag or git hash to build from.
ARG REPO_VERSION=master

View File

@ -59,12 +59,12 @@ cd "$(dirname "$REAL_PATH")/../docker/"
REPO_VERSION_CLEAN=$(echo "$REPO_VERSION" | sed 's|/|-|g')
[ -z "$APP_REPO" ] && APP_REPO=$(\grep APP_REPO Dockerfile | cut -f2 -d"=")
GITHUB_REPO=$(echo "$APP_REPO" | sed 's/git.openstack.org/github.com/' | \
GITHUB_REPO=$(echo "$APP_REPO" | sed 's/opendev.org/github.com/' | \
sed 's/ssh:/https:/')
if [ -z "$CONSTRAINTS_FILE" ]; then
CONSTRAINTS_FILE=$(\grep CONSTRAINTS_FILE Dockerfile | cut -f2 -d"=") || true
: "${CONSTRAINTS_FILE:=http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}"
: "${CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/master}"
fi
: "${CONSTRAINTS_BRANCH:=$2}"
@ -92,7 +92,7 @@ esac
# Monasca-common variables.
if [ -z "$COMMON_REPO" ]; then
COMMON_REPO=$(\grep COMMON_REPO Dockerfile | cut -f2 -d"=") || true
: "${COMMON_REPO:=https://git.openstack.org/openstack/monasca-common}"
: "${COMMON_REPO:=https://opendev.org/openstack/monasca-common}"
fi
: "${COMMON_VERSION:=$3}"

View File

@ -14,7 +14,7 @@ whitelist_externals = bash
rm
install_command = pip install {opts} {packages}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands =