openstack
/
solum
Code Issues Proposed changes

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

Change-Id: I3fda9c3ba5d53fe5610e6d7d796b1355eb6dea20
This commit is contained in:
zhulingjie 2019-04-23 16:50:06 +08:00
parent deea81aed6
commit 05399bc9bf
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.rst
View File

@ -46,12 +46,12 @@ See the getting_started_ guide.
Project Info Project Info
------------- -------------
* Source Code: https://git.openstack.org/cgit/openstack/solum/ * Source Code: https://opendev.org/openstack/solum/
* Wiki: https://wiki.openstack.org/wiki/Solum * Wiki: https://wiki.openstack.org/wiki/Solum
* Launchpad: https://launchpad.net/solum * Launchpad: https://launchpad.net/solum
* Blueprints: https://blueprints.launchpad.net/solum * Blueprints: https://blueprints.launchpad.net/solum
* Bugs: https://bugs.launchpad.net/solum * Bugs: https://bugs.launchpad.net/solum
* Code Reviews: https://review.openstack.org/#/q/project:openstack/solum * Code Reviews: https://review.opendev.org/#/q/project:openstack/solum
https://review.openstack.org/#/q/project:openstack/python-solumclient https://review.opendev.org/#/q/project:openstack/python-solumclient
* IRC: #solum at chat.freenode.net * IRC: #solum at chat.freenode.net
* Release notes: https://docs.openstack.org/releasenotes/solum/ * Release notes: https://docs.openstack.org/releasenotes/solum/

6
devstack/README.rst
View File

@ -11,20 +11,20 @@ Enabling Solum in DevStack
2. Download DevStack:: 2. Download DevStack::
git clone https://git.openstack.org/openstack-dev/devstack.git git clone https://opendev.org/openstack/devstack.git
cd devstack cd devstack
3. Add this repo as an external repository:: 3. Add this repo as an external repository::
cat > local.conf <<END cat > local.conf <<END
[[local|localrc]] [[local|localrc]]
enable_plugin solum https://git.openstack.org/openstack/solum enable_plugin solum https://opendev.org/openstack/solum
END END
To use stable branches, make sure devstack is on that branch, and specify To use stable branches, make sure devstack is on that branch, and specify
the branch name to enable_plugin, for example:: the branch name to enable_plugin, for example::
enable_plugin solum https://git.openstack.org/openstack/solum stable/mitaka enable_plugin solum https://opendev.org/openstack/solum stable/mitaka
4. Run ``./stack.sh``. 4. Run ``./stack.sh``.

26
devstack/devstack-provenance
View File

@ -104,7 +104,7 @@ pip|castellan|0.4.0
pip|cffi|1.7.0 pip|cffi|1.7.0
pip|chardet|2.0.1 pip|chardet|2.0.1
pip|Cheetah|2.4.4 pip|Cheetah|2.4.4
pip|https://git.openstack.org/openstack/cinder.git|19f7ef75a8a5027ab986dd75f3329df90c48e5eb pip|https://opendev.org/openstack/cinder.git|19f7ef75a8a5027ab986dd75f3329df90c48e5eb
pip|cliff|2.1.0 pip|cliff|2.1.0
pip|cloud-init|0.7.5 pip|cloud-init|0.7.5
pip|cmd2|0.6.8 pip|cmd2|0.6.8
@ -143,13 +143,13 @@ pip|futurist|0.16.0
pip|git-review|1.25.0 pip|git-review|1.25.0
pip|gitdb|0.6.4 pip|gitdb|0.6.4
pip|GitPython|2.0.7 pip|GitPython|2.0.7
pip|https://git.openstack.org/openstack/glance.git|70b930136a256413a282aeaf205deb2264f54c1d pip|https://opendev.org/openstack/glance.git|70b930136a256413a282aeaf205deb2264f54c1d
pip|glance-store|0.15.0 pip|glance-store|0.15.0
pip|google-api-python-client|1.5.1 pip|google-api-python-client|1.5.1
pip|greenlet|0.4.10 pip|greenlet|0.4.10
pip|hacking|0.10.2 pip|hacking|0.10.2
pip|https://git.openstack.org/openstack/heat.git|54bd5eb1bc279d90b2dcfed7b69c222235d4a5a6 pip|https://opendev.org/openstack/heat.git|54bd5eb1bc279d90b2dcfed7b69c222235d4a5a6
pip|https://git.openstack.org/openstack/horizon.git|2e84d5591963fdba18faa509484a0646ed79b6a9 pip|https://opendev.org/openstack/horizon.git|2e84d5591963fdba18faa509484a0646ed79b6a9
pip|html5lib|0.999 pip|html5lib|0.999
pip|httplib2|0.9.2 pip|httplib2|0.9.2
pip|idna|2.1 pip|idna|2.1
@ -159,7 +159,7 @@ pip|Jinja2|2.8
pip|jsonpatch|1.14 pip|jsonpatch|1.14
pip|jsonpointer|1.10 pip|jsonpointer|1.10
pip|jsonschema|2.5.1 pip|jsonschema|2.5.1
pip|https://git.openstack.org/openstack/keystone.git|bfa13b7a64011f3f7a6a5b97cd7bd3b69bca9a02 pip|https://opendev.org/openstack/keystone.git|bfa13b7a64011f3f7a6a5b97cd7bd3b69bca9a02
pip|keystoneauth1|2.10.0 pip|keystoneauth1|2.10.0
pip|keystonemiddleware|4.7.0 pip|keystonemiddleware|4.7.0
pip|kombu|3.0.35 pip|kombu|3.0.35
@ -181,14 +181,14 @@ pip|MySQL-python|1.2.3
pip|netaddr|0.7.18 pip|netaddr|0.7.18
pip|netifaces|0.10.4 pip|netifaces|0.10.4
pip|networkx|1.11 pip|networkx|1.11
pip|https://git.openstack.org/openstack/neutron.git|775893bb7f61c4641acbcb4ae16edf16e0989c39 pip|https://opendev.org/openstack/neutron.git|775893bb7f61c4641acbcb4ae16edf16e0989c39
pip|neutron-lib|0.3.0 pip|neutron-lib|0.3.0
pip|nodeenv|0.13.6 pip|nodeenv|0.13.6
pip|nose|1.3.7 pip|nose|1.3.7
pip|nose-exclude|0.4.1 pip|nose-exclude|0.4.1
pip|nosehtmloutput|0.0.5 pip|nosehtmloutput|0.0.5
pip|nosexcover|1.0.10 pip|nosexcover|1.0.10
pip|https://git.openstack.org/openstack/nova.git|859ff4893f699b680fec4db7dedd3bec8c8d0a1c pip|https://opendev.org/openstack/nova.git|859ff4893f699b680fec4db7dedd3bec8c8d0a1c
pip|nova-docker|0.0.1.dev268 pip|nova-docker|0.0.1.dev268
pip|numpy|1.11.1 pip|numpy|1.11.1
pip|oauth|1.0.1 pip|oauth|1.0.1
@ -286,7 +286,7 @@ pip|python-novaclient|5.0.0
pip|python-openstackclient|2.6.0 pip|python-openstackclient|2.6.0
pip|python-saharaclient|0.16.0 pip|python-saharaclient|0.16.0
pip|python-senlinclient|0.5.0 pip|python-senlinclient|0.5.0
pip|https://git.openstack.org/openstack/python-solumclient.git|07ad06c8cc6b3512da69588e5a4a9543dee4d534 pip|https://opendev.org/openstack/python-solumclient.git|07ad06c8cc6b3512da69588e5a4a9543dee4d534
pip|python-subunit|1.2.0 pip|python-subunit|1.2.0
pip|python-swiftclient|3.0.0 pip|python-swiftclient|3.0.0
pip|python-troveclient|2.3.0 pip|python-troveclient|2.3.0
@ -315,7 +315,7 @@ pip|simplejson|3.8.2
pip|singledispatch|3.4.0.3 pip|singledispatch|3.4.0.3
pip|six|1.10.0 pip|six|1.10.0
pip|smmap|0.9.0 pip|smmap|0.9.0
pip|https://git.openstack.org/openstack/solum-dashboard.git|d27d97dfd6b77bd0fc50ff1c279294eea76e6024 pip|https://opendev.org/openstack/solum-dashboard.git|d27d97dfd6b77bd0fc50ff1c279294eea76e6024
pip|Sphinx|1.2.3 pip|Sphinx|1.2.3
pip|sphinxcontrib-httpdomain|1.5.0 pip|sphinxcontrib-httpdomain|1.5.0
pip|sphinxcontrib-pecanwsme|0.8.0 pip|sphinxcontrib-pecanwsme|0.8.0
@ -325,9 +325,9 @@ pip|sqlparse|0.2.0
pip|ssh-import-id|3.21 pip|ssh-import-id|3.21
pip|stevedore|1.16.0 pip|stevedore|1.16.0
pip|suds-jurko|0.6 pip|suds-jurko|0.6
pip|https://git.openstack.org/openstack/swift.git|d819ae00a5f589fc7cd11ddf95cfce7323d926e8 pip|https://opendev.org/openstack/swift.git|d819ae00a5f589fc7cd11ddf95cfce7323d926e8
pip|taskflow|2.3.0 pip|taskflow|2.3.0
pip|https://git.openstack.org/openstack/tempest.git|05640decce8055e6844bdcc5a2c9bb18c1e3b2cb pip|https://opendev.org/openstack/tempest.git|05640decce8055e6844bdcc5a2c9bb18c1e3b2cb
pip|Tempita|0.5.2 pip|Tempita|0.5.2
pip|termcolor|1.1.0 pip|termcolor|1.1.0
pip|testrepository|0.0.20 pip|testrepository|0.0.20
@ -383,7 +383,7 @@ pip|XStatic-term.js|0.0.7.0
pip|xvfbwrapper|0.2.8 pip|xvfbwrapper|0.2.8
pip|yaql|1.1.1 pip|yaql|1.1.1
pip|zope.interface|4.2.0 pip|zope.interface|4.2.0
localrc|GIT_BASE=https://git.openstack.org localrc|GIT_BASE=https://opendev.org
localrc|LOGFILE=/opt/stack/logs/stack.sh.log localrc|LOGFILE=/opt/stack/logs/stack.sh.log
localrc|DATABASE_PASSWORD=<password> localrc|DATABASE_PASSWORD=<password>
localrc|RABBIT_PASSWORD=<password> localrc|RABBIT_PASSWORD=<password>
@ -398,7 +398,7 @@ localrc|VIRT_DRIVER=docker
localrc|SOLUM_IMAGE_FORMAT=docker localrc|SOLUM_IMAGE_FORMAT=docker
localrc|DEFAULT_IMAGE_NAME=cirros localrc|DEFAULT_IMAGE_NAME=cirros
localrc|IMAGE_URLS=" " localrc|IMAGE_URLS=" "
localrc|enable_plugin solum https://git.openstack.org/openstack/solum localrc|enable_plugin solum https://opendev.org/openstack/solum
localrc|IP_VERSION=4 localrc|IP_VERSION=4
localrc|SERVICE_IP_VERSION=4 localrc|SERVICE_IP_VERSION=4
localrc|enable_service solum-api localrc|enable_service solum-api

8
devstack/local.conf
View File

@ -9,7 +9,7 @@ ADMIN_PASSWORD=solum
NOVNC_FROM_PACKAGE=false NOVNC_FROM_PACKAGE=false
SOLUM_INSTALL_CEDARISH=False SOLUM_INSTALL_CEDARISH=False
SOLUM_INSTALL_DOCKERFILE=False SOLUM_INSTALL_DOCKERFILE=False
GIT_BASE=https://git.openstack.org GIT_BASE=https://opendev.org
# DOCKER_REGISTRY_IMAGE=registry:0.6.9 # DOCKER_REGISTRY_IMAGE=registry:0.6.9
VIRT_DRIVER=docker VIRT_DRIVER=docker
@ -18,10 +18,10 @@ SOLUM_IMAGE_FORMAT=docker
DEFAULT_IMAGE_NAME=cirros DEFAULT_IMAGE_NAME=cirros
IMAGE_URLS=" " IMAGE_URLS=" "
enable_plugin solum https://git.openstack.org/openstack/solum enable_plugin solum https://opendev.org/openstack/solum
enable_plugin heat https://git.openstack.org/openstack/heat enable_plugin heat https://opendev.org/openstack/heat
enable_plugin zun https://git.openstack.org/openstack/zun enable_plugin zun https://opendev.org/openstack/zun
IP_VERSION=4 IP_VERSION=4
SERVICE_IP_VERSION=4 SERVICE_IP_VERSION=4

2
devstack/settings
View File

@ -46,7 +46,7 @@ DEVSTACK_DIR=${HOME}/devstack
#----------------------------- #-----------------------------
LOGFILE=/opt/stack/logs/stack.sh.log LOGFILE=/opt/stack/logs/stack.sh.log
GIT_BASE=https://git.openstack.org GIT_BASE=https://opendev.org
VIRT_DRIVER=docker VIRT_DRIVER=docker
SOLUM_IMAGE_FORMAT=docker SOLUM_IMAGE_FORMAT=docker

2
solum/common/config.py
View File

@ -25,7 +25,7 @@ def set_config_defaults():
def set_cors_middleware_defaults(): def set_cors_middleware_defaults():
"""Update default configuration options for oslo.middleware.""" """Update default configuration options for oslo.middleware."""
# CORS Defaults # CORS Defaults
# TODO(krotscheck): Update with https://review.openstack.org/#/c/285368/ # TODO(krotscheck): Update with https://review.opendev.org/#/c/285368/
cfg.set_defaults(cors.CORS_OPTS, cfg.set_defaults(cors.CORS_OPTS,
allow_headers=['X-Auth-Token', allow_headers=['X-Auth-Token',
'X-Openstack-Request-Id', 'X-Openstack-Request-Id',

6
tox.ini
View File

@ -9,7 +9,7 @@ install_command = pip install -U {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
deps = 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}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
whitelist_externals = find whitelist_externals = find
@ -47,7 +47,7 @@ commands = oslo_debug_helper -t solum/tests {posargs}
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html commands = sphinx-build -W -b html doc/source doc/build/html
@ -65,7 +65,7 @@ commands =
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3 basepython = python3
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html