From abd90aca470b2e1199a10a637224c08ef620f188 Mon Sep 17 00:00:00 2001 From: zhulingjie Date: Tue, 23 Apr 2019 16:31:09 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Change-Id: I3664320061126e98bd9655d0ecc1fac565f00e40 --- CONTRIBUTING.rst | 10 +++++----- README.rst | 6 +++--- .../elements/murano-agent/install.d/74-murano-agent | 2 +- tox.ini | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 49313d6c..4afbb6fd 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -35,15 +35,15 @@ Project Hosting Details * https://wiki.openstack.org/wiki/Meetings#Murano_meeting * Code Hosting - * https://git.openstack.org/cgit/openstack/murano + * https://opendev.org/openstack/murano - * https://git.openstack.org/cgit/openstack/murano-agent + * https://opendev.org/openstack/murano-agent - * https://git.openstack.org/cgit/openstack/murano-dashboard + * https://opendev.org/openstack/murano-dashboard - * https://git.openstack.org/cgit/openstack/python-muranoclient + * https://opendev.org/openstack/python-muranoclient * Code Review - * https://review.openstack.org/#/q/murano+AND+status:+open,n,z + * https://review.opendev.org/#/q/murano+AND+status:+open,n,z * https://docs.openstack.org/infra/manual/developers.html#development-workflow diff --git a/README.rst b/README.rst index 05a90186..7395a7f5 100644 --- a/README.rst +++ b/README.rst @@ -17,7 +17,7 @@ Image building using DiskImage-Builder -------------------------------------- Folder, named *contrib/elements* contains -`diskimage-builder `_ +`diskimage-builder `_ elements to build an image which contains the Murano Agent required to use Murano. Ubuntu based image containing the agent can be built and uploaded @@ -25,8 +25,8 @@ to Glance with the following commands: :: - $ git clone https://git.openstack.org/openstack/diskimage-builder.git - $ git clone https://git.openstack.org/openstack/murano-agent.git + $ git clone https://opendev.org/openstack/diskimage-builder.git + $ git clone https://opendev.org/openstack/murano-agent.git $ export ELEMENTS_PATH=murano-agent/contrib/elements $ export DIB_CLOUD_INIT_DATASOURCES=OpenStack $ diskimage-builder/bin/disk-image-create vm ubuntu \ diff --git a/contrib/elements/murano-agent/install.d/74-murano-agent b/contrib/elements/murano-agent/install.d/74-murano-agent index 152ae11d..682f8361 100755 --- a/contrib/elements/murano-agent/install.d/74-murano-agent +++ b/contrib/elements/murano-agent/install.d/74-murano-agent @@ -13,7 +13,7 @@ fi name=murano-agent svc_root=${DIB_MURANO_AGENT_SVC_ROOT:-/opt/stack/$name} -repo=${DIB_MURANO_AGENT_REPO:-https://git.openstack.org/openstack/murano-agent.git} +repo=${DIB_MURANO_AGENT_REPO:-https://opendev.org/openstack/murano-agent.git} branch=${DIB_MURANO_AGENT_BRANCH:-master} ref=${DIB_MURANO_AGENT_REF:-''} diff --git a/tox.ini b/tox.ini index 53b61b33..bade1e93 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ skipsdist = True setenv = VIRTUAL_ENV={envdir} passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = @@ -40,7 +40,7 @@ commands = [testenv:docs] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html @@ -57,7 +57,7 @@ commands = oslo-config-generator --config-file etc/oslo-config-generator/muranoa [testenv:releasenotes] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html