From 8d85e61c36e63860e5a1742b40fa0f9c8e5a84da Mon Sep 17 00:00:00 2001 From: jacky06 Date: Tue, 23 Apr 2019 13:04:44 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Change-Id: I0f522b848c586506d9556b6821d03f9c0c302cd8 --- README.rst | 2 +- ci/common/vbmc_setup.yaml | 4 ++-- deployment/sahara/sahara-base.yaml | 2 +- environments/docker-uc-light.yaml | 2 +- environments/neutron-ovs-dvr.yaml | 2 +- environments/services/neutron-ovs-dvr.yaml | 2 +- environments/services/neutron-ovs.yaml | 2 +- extraconfig/tasks/instanceha/check-run-nova-compute | 2 +- overcloud-resource-registry-puppet.j2.yaml | 2 +- releasenotes/notes/6.0.0-b52a14a71fc62788.yaml | 2 +- .../notes/fix-odl-karaf-logging-eca10973e57caa3a.yaml | 2 +- .../fix-str-replace-hostname-issue-393fb6954f12f7e6.yaml | 2 +- releasenotes/notes/nova_metadata_wsgi-bfb240bc84194d05.yaml | 2 +- .../notes/nova_qemu_enable_config-c89016b4d93802d6.yaml | 2 +- .../notes/nova_templated_cells_db_urls-2eb151090c49c51d.yaml | 2 +- .../nova_templated_cells_transport_url-275f0b707d9227ab.yaml | 2 +- .../nova_use_nova_api_db_for_placement-eea44dd48c768f04.yaml | 2 +- setup.cfg | 2 +- tox.ini | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.rst b/README.rst index 57e9c4a7ba..7f47a308ee 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ Heat templates to deploy OpenStack using OpenStack. * Free software: Apache License (2.0) * Documentation: https://docs.openstack.org/tripleo-docs/latest/ -* Source: https://git.openstack.org/cgit/openstack/tripleo-heat-templates +* Source: https://opendev.org/openstack/tripleo-heat-templates * Bugs: https://bugs.launchpad.net/tripleo * Release notes: https://docs.openstack.org/releasenotes/tripleo-heat-templates/ diff --git a/ci/common/vbmc_setup.yaml b/ci/common/vbmc_setup.yaml index 4d452c8174..f52821b4ca 100644 --- a/ci/common/vbmc_setup.yaml +++ b/ci/common/vbmc_setup.yaml @@ -19,12 +19,12 @@ resources: #!/bin/bash cd /etc/yum.repos.d echo 'nameserver 1.1.1.1' > /etc/resolv.conf - curl https://git.openstack.org/cgit/openstack/tripleo-repos/plain/tripleo_repos/main.py | python - current-tripleo + curl https://opendev.org/openstack/tripleo-repos/raw/branch/master/tripleo_repos/main.py | python - current-tripleo yum install -y python2-virtualbmc epel-release libvirt-client libvirt-daemon libvirt qemu-kvm-ev yum install -y qemu-system-x86 # <-- needs epel yum remove -y epel-release systemctl start libvirtd - git clone https://git.openstack.org/openstack/ironic /tmp/ironic + git clone https://opendev.org/openstack/ironic /tmp/ironic mkdir -p /var/log/bmlogs chmod 777 /var/log/bmlogs diff --git a/deployment/sahara/sahara-base.yaml b/deployment/sahara/sahara-base.yaml index 1c7ca31054..c201fdc084 100644 --- a/deployment/sahara/sahara-base.yaml +++ b/deployment/sahara/sahara-base.yaml @@ -84,7 +84,7 @@ outputs: - service_debug_unset - {get_param: Debug } - {get_param: SaharaDebug } - # Remove admin_password when https://review.openstack.org/442619 is merged. + # Remove admin_password when https://review.opendev.org/#/c/442619/ is merged. sahara::admin_password: {get_param: SaharaPassword} sahara::default_ntp_server: {get_param: NtpServer} sahara::use_neutron: true diff --git a/environments/docker-uc-light.yaml b/environments/docker-uc-light.yaml index 7f02c3b65a..1599d25f5a 100644 --- a/environments/docker-uc-light.yaml +++ b/environments/docker-uc-light.yaml @@ -3,7 +3,7 @@ resource_registry: OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 # FIXME(bogdando): can not be switched yet due to puppet-base issues - # see https://review.openstack.org/#/c/563443 + # see https://review.opendev.org/#/c/563443 OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Services::ContainersLogrotateCrond: ../deployment/logrotate/logrotate-crond-container-puppet.yaml diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index 009c198575..b5bd624062 100644 --- a/environments/neutron-ovs-dvr.yaml +++ b/environments/neutron-ovs-dvr.yaml @@ -4,7 +4,7 @@ resource_registry: # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 # FIXME(bogdando): can not be switched yet due to puppet-base issues - # see https://review.openstack.org/#/c/563443 + # see https://review.opendev.org/#/c/563443 OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Services::NeutronServer: ../deployment/neutron/neutron-api-container-puppet.yaml diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml index 59b97f4888..4637c50e73 100644 --- a/environments/services/neutron-ovs-dvr.yaml +++ b/environments/services/neutron-ovs-dvr.yaml @@ -2,7 +2,7 @@ resource_registry: # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 # FIXME(bogdando): can not be switched yet due to puppet-base issues - # see https://review.openstack.org/#/c/563443 + # see https://review.opendev.org/#/c/563443 OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml diff --git a/environments/services/neutron-ovs.yaml b/environments/services/neutron-ovs.yaml index 384b5b1ade..68c0efffb4 100644 --- a/environments/services/neutron-ovs.yaml +++ b/environments/services/neutron-ovs.yaml @@ -5,7 +5,7 @@ resource_registry: # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 # FIXME(bogdando): can not be switched yet due to puppet-base issues - # see https://review.openstack.org/#/c/563443 + # see https://review.opendev.org/#/c/563443 OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml diff --git a/extraconfig/tasks/instanceha/check-run-nova-compute b/extraconfig/tasks/instanceha/check-run-nova-compute index eda2084165..6171575dc9 100755 --- a/extraconfig/tasks/instanceha/check-run-nova-compute +++ b/extraconfig/tasks/instanceha/check-run-nova-compute @@ -100,7 +100,7 @@ def create_nova_connection(options): # the [placement]/os_interface key. if 'os_interface' in options and len(options["os_interface"]) == 1: nova_endpoint_type = options["os_interface"][0] - # Via https://review.openstack.org/#/c/492247/ os_interface has been deprecatd in queens + # Via https://review.opendev.org/#/c/492247/ os_interface has been deprecatd in queens # and we need to use 'valid_interfaces' which is a: # "List of interfaces, in order of preference, for endpoint URL. (list value)" # Since it is not explicitely set in nova.conf we still keep the check for os_interface diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 66d4db964f..bc2ed6d88a 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -335,7 +335,7 @@ resource_registry: # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 # FIXME(bogdando): can not be switched yet due to puppet-base issues - # see https://review.openstack.org/#/c/563443 + # see https://review.opendev.org/#/c/563443 OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml OS::TripleO::Services::Multipathd: OS::Heat::None diff --git a/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml b/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml index ffc8ad9eb7..e7e35af084 100644 --- a/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml +++ b/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml @@ -122,6 +122,6 @@ fixes: - Fixes `bug 1662344 `__ by stopping to set bind_address on nova db uri. - This reverts the changes in https://review.openstack.org/414629 for nova as + This reverts the changes in https://review.opendev.org/#/c/414629/ for nova as they are incompatible with cell_v2. This is a temporary fix for HA while a long-term solution is developed. diff --git a/releasenotes/notes/fix-odl-karaf-logging-eca10973e57caa3a.yaml b/releasenotes/notes/fix-odl-karaf-logging-eca10973e57caa3a.yaml index 17fc672053..0e68e118bf 100644 --- a/releasenotes/notes/fix-odl-karaf-logging-eca10973e57caa3a.yaml +++ b/releasenotes/notes/fix-odl-karaf-logging-eca10973e57caa3a.yaml @@ -8,5 +8,5 @@ fixes: Also, moves openDaylight karaf log file location to /var/log/containers/opendaylight/karaf/logs/karaf.log. - Reference https://review.openstack.org/#/c/603907/ for + Reference https://review.opendev.org/#/c/603907/ for more details. diff --git a/releasenotes/notes/fix-str-replace-hostname-issue-393fb6954f12f7e6.yaml b/releasenotes/notes/fix-str-replace-hostname-issue-393fb6954f12f7e6.yaml index 0241364526..ca2c191af7 100644 --- a/releasenotes/notes/fix-str-replace-hostname-issue-393fb6954f12f7e6.yaml +++ b/releasenotes/notes/fix-str-replace-hostname-issue-393fb6954f12f7e6.yaml @@ -7,4 +7,4 @@ fixes: replacement mechanism used previously was replaced by a yaql expression that will do exact matching only. If no matching key is in the HostnameMap, the default hostname is returned. - `bug 1781560 `_. + `bug 1781560 `_. diff --git a/releasenotes/notes/nova_metadata_wsgi-bfb240bc84194d05.yaml b/releasenotes/notes/nova_metadata_wsgi-bfb240bc84194d05.yaml index c8280452ec..2e5fb07e44 100644 --- a/releasenotes/notes/nova_metadata_wsgi-bfb240bc84194d05.yaml +++ b/releasenotes/notes/nova_metadata_wsgi-bfb240bc84194d05.yaml @@ -3,5 +3,5 @@ features: - | Usage of eventlet of all the WSGI-run nova services get deprecated, including nova-api and nova-metadata-api. - See https://review.openstack.org/#/c/549510/ for more details. + See https://review.opendev.org/#/c/549510/ for more details. With this change we move nova-metadata to run via httpd wsgi. diff --git a/releasenotes/notes/nova_qemu_enable_config-c89016b4d93802d6.yaml b/releasenotes/notes/nova_qemu_enable_config-c89016b4d93802d6.yaml index f6775b381c..f97d5072d0 100644 --- a/releasenotes/notes/nova_qemu_enable_config-c89016b4d93802d6.yaml +++ b/releasenotes/notes/nova_qemu_enable_config-c89016b4d93802d6.yaml @@ -1,7 +1,7 @@ --- fixes: - | - With https://review.openstack.org/#/c/561784 we change the default + With https://review.opendev.org/#/c/561784 we change the default migration port range to '61152-61215'. nova::migration::qemu::configure_qemu needs to be set to true that the config gets applied via puppet-nova. diff --git a/releasenotes/notes/nova_templated_cells_db_urls-2eb151090c49c51d.yaml b/releasenotes/notes/nova_templated_cells_db_urls-2eb151090c49c51d.yaml index 9653a7c985..af0616e38d 100644 --- a/releasenotes/notes/nova_templated_cells_db_urls-2eb151090c49c51d.yaml +++ b/releasenotes/notes/nova_templated_cells_db_urls-2eb151090c49c51d.yaml @@ -7,4 +7,4 @@ features: be a simpler and less obscure method of configuring things like the per-node bind_address necessary for director's HA arrangement. This patch addresses the templated DB urls as part 1. - Nova support added here - https://review.openstack.org/578163 + Nova support added here - https://review.opendev.org/#/c/578163/ diff --git a/releasenotes/notes/nova_templated_cells_transport_url-275f0b707d9227ab.yaml b/releasenotes/notes/nova_templated_cells_transport_url-275f0b707d9227ab.yaml index cde5807fd3..ad99956b54 100644 --- a/releasenotes/notes/nova_templated_cells_transport_url-275f0b707d9227ab.yaml +++ b/releasenotes/notes/nova_templated_cells_transport_url-275f0b707d9227ab.yaml @@ -7,4 +7,4 @@ features: be a simpler and less obscure method of configuring things like the per-node bind_address necessary for director's HA arrangement. This patch addresses the templated transport urls as part 2. - Nova support added here - https://review.openstack.org/578163 + Nova support added here - https://review.opendev.org/578163 diff --git a/releasenotes/notes/nova_use_nova_api_db_for_placement-eea44dd48c768f04.yaml b/releasenotes/notes/nova_use_nova_api_db_for_placement-eea44dd48c768f04.yaml index 24bb1745e5..5da2751ae6 100644 --- a/releasenotes/notes/nova_use_nova_api_db_for_placement-eea44dd48c768f04.yaml +++ b/releasenotes/notes/nova_use_nova_api_db_for_placement-eea44dd48c768f04.yaml @@ -4,7 +4,7 @@ fixes: With OOO we configure a separate DB for placement for the undercloud and overcloud since the beginning. But the placement_database config options were reverted with - https://review.openstack.org/#/c/442762/1 , which means so far even if + https://review.opendev.org/#/c/442762/1 , which means so far even if the config option was set, it was not used. With rocky the options were introduced again which is not a problem on a fresh installed env, but on upgrades from queens to rocky. diff --git a/setup.cfg b/setup.cfg index eededd207a..290cbfd9c7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ description-file = author = OpenStack author_email = openstack-discuss@lists.openstack.org license = Apache License (2.0) -home-page = https://git.openstack.org/cgit/openstack/tripleo-heat-templates +home-page = https://opendev.org/openstack/tripleo-heat-templates classifier = Environment :: OpenStack Development Status :: 3 - Alpha diff --git a/tox.ini b/tox.ini index dd73f9c391..f9ff0e67de 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = pep8,py37,py36,py35,py27 usedevelop = True 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://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}'