diff --git a/Gemfile b/Gemfile index e3bca325f..e63b99cfa 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :development, :test, :system_tests do :require => 'false' else gem 'puppet-openstack_spec_helper', - :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper', + :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper', :require => 'false' end gem 'fast_gettext', ['< 1.2.0'] diff --git a/Puppetfile b/Puppetfile index eb92501eb..d5ae54f61 100644 --- a/Puppetfile +++ b/Puppetfile @@ -2,155 +2,155 @@ ## OpenStack modules mod 'aodh', - :git => 'https://git.openstack.org/openstack/puppet-aodh', + :git => 'https://opendev.org/openstack/puppet-aodh', :ref => 'master' mod 'barbican', - :git => 'https://git.openstack.org/openstack/puppet-barbican', + :git => 'https://opendev.org/openstack/puppet-barbican', :ref => 'master' mod 'ceilometer', - :git => 'https://git.openstack.org/openstack/puppet-ceilometer', + :git => 'https://opendev.org/openstack/puppet-ceilometer', :ref => 'master' mod 'ceph', - :git => 'https://git.openstack.org/openstack/puppet-ceph', + :git => 'https://opendev.org/openstack/puppet-ceph', :ref => 'master' mod 'cinder', - :git => 'https://git.openstack.org/openstack/puppet-cinder', + :git => 'https://opendev.org/openstack/puppet-cinder', :ref => 'master' mod 'cloudkitty', - :git => 'https://git.openstack.org/openstack/puppet-cloudkitty', + :git => 'https://opendev.org/openstack/puppet-cloudkitty', :ref => 'master' mod 'congress', - :git => 'https://git.openstack.org/openstack/puppet-congress', + :git => 'https://opendev.org/openstack/puppet-congress', :ref => 'master' mod 'designate', - :git => 'https://git.openstack.org/openstack/puppet-designate', + :git => 'https://opendev.org/openstack/puppet-designate', :ref => 'master' mod 'ec2api', - :git => 'https://git.openstack.org/openstack/puppet-ec2api', + :git => 'https://opendev.org/openstack/puppet-ec2api', :ref => 'master' mod 'glance', - :git => 'https://git.openstack.org/openstack/puppet-glance', + :git => 'https://opendev.org/openstack/puppet-glance', :ref => 'master' mod 'gnocchi', - :git => 'https://git.openstack.org/openstack/puppet-gnocchi', + :git => 'https://opendev.org/openstack/puppet-gnocchi', :ref => 'master' mod 'heat', - :git => 'https://git.openstack.org/openstack/puppet-heat', + :git => 'https://opendev.org/openstack/puppet-heat', :ref => 'master' mod 'horizon', - :git => 'https://git.openstack.org/openstack/puppet-horizon', + :git => 'https://opendev.org/openstack/puppet-horizon', :ref => 'master' mod 'ironic', - :git => 'https://git.openstack.org/openstack/puppet-ironic', + :git => 'https://opendev.org/openstack/puppet-ironic', :ref => 'master' mod 'keystone', - :git => 'https://git.openstack.org/openstack/puppet-keystone', + :git => 'https://opendev.org/openstack/puppet-keystone', :ref => 'master' mod 'manila', - :git => 'https://git.openstack.org/openstack/puppet-manila', + :git => 'https://opendev.org/openstack/puppet-manila', :ref => 'master' mod 'mistral', - :git => 'https://git.openstack.org/openstack/puppet-mistral', + :git => 'https://opendev.org/openstack/puppet-mistral', :ref => 'master' mod 'monasca', - :git => 'https://git.openstack.org/openstack/puppet-monasca', + :git => 'https://opendev.org/openstack/puppet-monasca', :ref => 'master' mod 'murano', - :git => 'https://git.openstack.org/openstack/puppet-murano', + :git => 'https://opendev.org/openstack/puppet-murano', :ref => 'master' mod 'neutron', - :git => 'https://git.openstack.org/openstack/puppet-neutron', + :git => 'https://opendev.org/openstack/puppet-neutron', :ref => 'master' mod 'nova', - :git => 'https://git.openstack.org/openstack/puppet-nova', + :git => 'https://opendev.org/openstack/puppet-nova', :ref => 'master' mod 'octavia', - :git => 'https://git.openstack.org/openstack/puppet-octavia', + :git => 'https://opendev.org/openstack/puppet-octavia', :ref => 'master' mod 'openstack_extras', - :git => 'https://git.openstack.org/openstack/puppet-openstack_extras', + :git => 'https://opendev.org/openstack/puppet-openstack_extras', :ref => 'master' mod 'openstacklib', - :git => 'https://git.openstack.org/openstack/puppet-openstacklib', + :git => 'https://opendev.org/openstack/puppet-openstacklib', :ref => 'master' mod 'oslo', - :git => 'https://git.openstack.org/openstack/puppet-oslo', + :git => 'https://opendev.org/openstack/puppet-oslo', :ref => 'master' mod 'ovn', - :git => 'https://git.openstack.org/openstack/puppet-ovn', + :git => 'https://opendev.org/openstack/puppet-ovn', :ref => 'master' mod 'panko', - :git => 'https://git.openstack.org/openstack/puppet-panko', + :git => 'https://opendev.org/openstack/puppet-panko', :ref => 'master' mod 'placement', - :git => 'https://git.openstack.org/openstack/puppet-placement', + :git => 'https://opendev.org/openstack/puppet-placement', :ref => 'master' mod 'qdr', - :git => 'https://git.openstack.org/openstack/puppet-qdr', + :git => 'https://opendev.org/openstack/puppet-qdr', :ref => 'master' mod 'sahara', - :git => 'https://git.openstack.org/openstack/puppet-sahara', + :git => 'https://opendev.org/openstack/puppet-sahara', :ref => 'master' mod 'swift', - :git => 'https://git.openstack.org/openstack/puppet-swift', + :git => 'https://opendev.org/openstack/puppet-swift', :ref => 'master' mod 'tacker', - :git => 'https://git.openstack.org/openstack/puppet-tacker', + :git => 'https://opendev.org/openstack/puppet-tacker', :ref => 'master' mod 'tempest', - :git => 'https://git.openstack.org/openstack/puppet-tempest', + :git => 'https://opendev.org/openstack/puppet-tempest', :ref => 'master' mod 'trove', - :git => 'https://git.openstack.org/openstack/puppet-trove', + :git => 'https://opendev.org/openstack/puppet-trove', :ref => 'master' mod 'vswitch', - :git => 'https://git.openstack.org/openstack/puppet-vswitch', + :git => 'https://opendev.org/openstack/puppet-vswitch', :ref => 'master' mod 'vitrage', - :git => 'https://git.openstack.org/openstack/puppet-vitrage', + :git => 'https://opendev.org/openstack/puppet-vitrage', :ref => 'master' mod 'watcher', - :git => 'https://git.openstack.org/openstack/puppet-watcher', + :git => 'https://opendev.org/openstack/puppet-watcher', :ref => 'master' mod 'zaqar', - :git => 'https://git.openstack.org/openstack/puppet-zaqar', + :git => 'https://opendev.org/openstack/puppet-zaqar', :ref => 'master' ## External modules diff --git a/all-in-one.sh b/all-in-one.sh index 2f309027c..f09c17c83 100755 --- a/all-in-one.sh +++ b/all-in-one.sh @@ -23,7 +23,7 @@ # * At least 10GB of storage # # Usage: -# $ git clone https://git.openstack.org/openstack/puppet-openstack-integration +# $ git clone https://opendev.org/openstack/puppet-openstack-integration # $ cd puppet-openstack-integration # $ ./all-in-one.sh # diff --git a/functions b/functions index fbcfa1a0c..462b67a1f 100644 --- a/functions +++ b/functions @@ -44,7 +44,7 @@ EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml \ --cache-dir /opt/git \ --zuul-branch $ZUUL_BRANCH \ - https://git.openstack.org $project_names + https://opendev.org $project_names # Because openstack-integration can't be a class name. # https://projects.puppetlabs.com/issues/5268 diff --git a/run_tests.sh b/run_tests.sh index a3eee1f2a..2b22f6777 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -112,11 +112,11 @@ if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then # For ubuntu we always need to deploy tempest-horizon from source if uses_debs; then /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ - https://git.openstack.org openstack/tempest-horizon + https://opendev.org openstack/tempest-horizon fi if [ "${TEMPEST_FROM_SOURCE}" = true ]; then /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ - https://git.openstack.org openstack/tempest + https://opendev.org openstack/tempest # Pin Tempest to TEMPEST_VERSION unless we're running inside the # openstack/tempest gate. if [[ "${ZUUL_PROJECT}" != "openstack/tempest" ]]; then @@ -129,11 +129,11 @@ else # For ubuntu we always need to deploy tempest-horizon from source if uses_debs; then $SUDO rm -rf /tmp/openstack/tempest-horizon - git clone https://git.openstack.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon + git clone https://opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon fi if [ "${TEMPEST_FROM_SOURCE}" = true ]; then $SUDO rm -rf /tmp/openstack/tempest - git clone https://git.openstack.org/openstack/tempest /tmp/openstack/tempest + git clone https://opendev.org/openstack/tempest /tmp/openstack/tempest pushd /tmp/openstack/tempest git reset --hard origin/$TEMPEST_VERSION popd @@ -348,7 +348,7 @@ cd /tmp/openstack/tempest if [ "${TEMPEST_FROM_SOURCE}" = true ]; then virtualenv --system-site-packages run_tempest - run_tempest/bin/pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt -U -r requirements.txt + run_tempest/bin/pip install -c https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt -U -r requirements.txt run_tempest/bin/python setup.py install run_tempest/bin/stestr init export tempest_binary="run_tempest/bin/tempest"