From ec852a3fad9e879f69e790abe3d0a99bbd8472a5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 21 Apr 2019 12:28:12 +0000 Subject: [PATCH] Update links for opendev The most important bits are updating shade references to remove the openstack-infra. The other git urls will work through the redirect, but cleaning them up is just nicer. This removes two comments that reference files that no longer exist due to config generation. Also, fix some random use of github for cloning openstack repos, since the github mirror is best-effort only. Change-Id: I55a1d9db940cf5fa2c35421db7add015ae334563 Needed-By: https://review.opendev.org/654056 --- CONTRIBUTING.rst | 2 +- README.rst | 2 +- doc/source/install/index.rst | 4 ++-- doc/source/user/howto.rst | 6 +++--- doc/source/user/troubleshooting.rst | 8 ++++---- doc/source/user/vagrant.rst | 2 +- .../roles/bifrost-create-dib-image/README.md | 2 +- .../bifrost-ironic-install/defaults/main.yml | 16 +++++++-------- .../templates/ironic-inspector.conf.j2 | 7 ++----- .../templates/ironic.conf.j2 | 4 ---- .../defaults/main.yml | 2 +- .../roles/bifrost-openstack-ci-prep/README.md | 2 +- .../roles/bifrost-prep-for-install/README.md | 8 ++++---- .../defaults/main.yml | 20 +++++++++---------- .../roles/ironic-enroll-dynamic/README.md | 4 ++-- playbooks/test-bifrost.yaml | 4 ++-- ...port-staging-drivers-1c398a56dde9b240.yaml | 2 +- tox.ini | 6 +++--- 18 files changed, 47 insertions(+), 54 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 3ee5d43eb..3f6c5d643 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -40,7 +40,7 @@ been sufficiently reviewed it will be merged from there. Once that's done, the development workflow is, roughly:: - $ git clone https://git.openstack.org/openstack/bifrost + $ git clone https://opendev.org/openstack/bifrost $ cd bifrost $ git checkout -b some-branch-name ... hack hack hack ... diff --git a/README.rst b/README.rst index 05cf47d69..c2f57e9de 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,7 @@ Bifrost's documentation can be found at the `OpenStack documentation site `_. The project source code repository is located at: - https://git.openstack.org/cgit/openstack/bifrost/ + https://opendev.org/openstack/bifrost/ Bugs can be filed in storyboard: https://storyboard.openstack.org/#!/project/941 diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index 262c212b7..5237c284c 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -110,7 +110,7 @@ Cloning Clone the Bifrost repository:: - git clone https://git.openstack.org/openstack/bifrost.git + git clone https://opendev.org/openstack/bifrost cd bifrost Installation of Ansible @@ -260,7 +260,7 @@ An additional collection of drivers are maintained outside of the ironic source code repository, as they do not have Continuous Integration (CI) testing. These drivers and information about them can be found in -`ironic-staging-drivers docs `_. +`ironic-staging-drivers docs `_. If you would like to install the ironic staging drivers, simply pass ``-e staging_drivers_include=true`` when executing the install playbook:: diff --git a/doc/source/user/howto.rst b/doc/source/user/howto.rst index e80f073a6..bd70788f4 100644 --- a/doc/source/user/howto.rst +++ b/doc/source/user/howto.rst @@ -59,8 +59,8 @@ Enroll Hardware The following requirements are installed during the install process as documented in the install documentation. -- openstack-infra/shade library -- openstack-infra/os-client-config +- openstack/shade library +- openstack/os-client-config In order to enroll hardware, you will naturally need an inventory of your hardware. When utilizing the dynamic inventory module and @@ -317,7 +317,7 @@ Deployment and configuration of operating systems By default, Bifrost deploys a configuration drive which includes the user SSH public key, hostname, and the network configuration in the form of network_data.json that can be read/parsed by the -`glean `_ utility. This allows for +`glean `_ utility. This allows for the deployment of Ubuntu, CentOS, or Fedora "tenants" on baremetal. This file format is not yet supported by Cloud-Init, however it is on track for inclusion in cloud-init 2.0. diff --git a/doc/source/user/troubleshooting.rst b/doc/source/user/troubleshooting.rst index e2571b379..610a1f58e 100644 --- a/doc/source/user/troubleshooting.rst +++ b/doc/source/user/troubleshooting.rst @@ -64,9 +64,9 @@ and Tiny Core based images are what are used by the OpenStack CI for ironic tests. CoreOS:: - https://git.openstack.org/cgit/openstack/ironic-python-agent/tree/imagebuild/coreos/README.rst + https://opendev.org/openstack/ironic-python-agent/src/branch/master/imagebuild/coreos/README.rst TinyIPA:: - https://git.openstack.org/cgit/openstack/ironic-python-agent/tree/imagebuild/tinyipa/README.rst + https://opendev.org/openstack/ironic-python-agent/src/branch/master/imagebuild/tinyipa/README.rst For documentation on diskimage-builder, See:: https://docs.openstack.org/diskimage-builder/latest/. @@ -77,7 +77,7 @@ https://docs.openstack.org/ironic/latest/install/deploy-ramdisk.html This essentially boils down to the following steps: -#. ``git clone https://git.openstack.org/openstack/ironic-python-agent`` +#. ``git clone https://opendev.org/openstack/ironic-python-agent`` #. ``cd ironic-python-agent`` #. ``pip install -r ./requirements.txt`` #. If you don't already have docker installed, execute: @@ -152,7 +152,7 @@ Custom built images will require a user to be burned into the image. Typically a user would use the diskimage-builder devuser element to achieve this. More detail on this can be located at:: - https://github.com/openstack/diskimage-builder/tree/master/elements/devuser + https://opendev.org/openstack/diskimage-builder/src/branch/master/diskimage_builder/elements/devuser Example:: diff --git a/doc/source/user/vagrant.rst b/doc/source/user/vagrant.rst index d8a4f5bf7..6fce3a771 100644 --- a/doc/source/user/vagrant.rst +++ b/doc/source/user/vagrant.rst @@ -44,7 +44,7 @@ Configure Vagrant with the correct box:: Clone bifrost repo:: - git clone https://github.com/openstack/bifrost.git + git clone https://opendev.org/openstack/bifrost Change into the bifrost directory:: diff --git a/playbooks/roles/bifrost-create-dib-image/README.md b/playbooks/roles/bifrost-create-dib-image/README.md index 36875d8d1..c543a0b4c 100644 --- a/playbooks/roles/bifrost-create-dib-image/README.md +++ b/playbooks/roles/bifrost-create-dib-image/README.md @@ -22,7 +22,7 @@ build_ramdisk: false The dib_env_vars are settings for the diskimage-builder environment variables which allow settings to be passed to elements that are being utilized to build a disk image. More information on diskimage-builder can be found at: -https://git.openstack.org/cgit/openstack/diskimage-builder/ +https://opendev.org/openstack/diskimage-builder/ dib_env_vars: DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive" diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 567d3805b..f12903ae8 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -74,13 +74,13 @@ cirros_deploy_image_upstream_url: https://download.cirros-cloud.net/0.3.4/cirros # this setting, and perform manual configuration of your DHCP server. include_dhcp_server: true # *_git_url can be overridden by local clones for offline installs -dib_git_url: https://git.openstack.org/openstack/diskimage-builder -ironicclient_git_url: https://git.openstack.org/openstack/python-ironicclient -openstacksdk_git_url: https://git.openstack.org/openstack/openstacksdk -shade_git_url: https://git.openstack.org/openstack-infra/shade -ironic_git_url: https://git.openstack.org/openstack/ironic -ironicinspector_git_url: https://github.com/openstack/ironic-inspector -ironicinspectorclient_git_url: https://github.com/openstack/python-ironic-inspector-client +dib_git_url: https://opendev.org/openstack/diskimage-builder +ironicclient_git_url: https://opendev.org/openstack/python-ironicclient +openstacksdk_git_url: https://opendev.org/openstack/openstacksdk +shade_git_url: https://opendev.org/openstack/shade +ironic_git_url: https://opendev.org/openstack/ironic +ironicinspector_git_url: https://opendev.org/openstack/ironic-inspector +ironicinspectorclient_git_url: https://opendev.org/openstack/python-ironic-inspector-client mysql_username: "root" mysql_password: "" # NOTE(TheJulia): While we have indicated we're going to deprecate ironic_db_password, @@ -99,7 +99,7 @@ upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(re staging_drivers_git_folder: /opt/stack/ironic-staging-drivers ironicinspector_git_folder: /opt/stack/ironic-inspector ironicinspectorclient_git_folder: /opt/stack/python-ironic-inspector-client -staging_drivers_git_url: https://git.openstack.org/cgit/openstack/ironic-staging-drivers +staging_drivers_git_url: https://opendev.org/x/ironic-staging-drivers # TODO(TheJulia): Add redfish to this list. enabled_hardware_types: "ipmi,ilo" diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2 index 425a70a72..5676ec251 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2 @@ -1,8 +1,5 @@ -{# -# Note(TheJulia): This file is based upon the file format provided by the git -# committed example located at: -# http://git.openstack.org/cgit/openstack/ironic-inspector/tree/example.conf -#} +# {{ ansible_managed }} + [DEFAULT] {% if enable_keystone is defined and enable_keystone | bool == true %} auth_strategy = keystone diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 index 28f7782f5..520f743ad 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 @@ -1,8 +1,4 @@ # {{ ansible_managed }} -# For additional details on configuring ironic, you may wish to reference -# the sample configuration file which can be located at -# http://git.openstack.org/cgit/openstack/ironic/tree/etc/ironic/ironic.conf.sample - [DEFAULT] debug = {{ testing | bool }} diff --git a/playbooks/roles/bifrost-keystone-install/defaults/main.yml b/playbooks/roles/bifrost-keystone-install/defaults/main.yml index e53d5db9d..078d550ad 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/main.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/main.yml @@ -1,7 +1,7 @@ --- keystone_source_install: true # *_git_url can be overridden by local clones for offline installs -keystone_git_url: https://git.openstack.org/openstack/keystone +keystone_git_url: https://opendev.org/openstack/keystone keystone_git_folder: /opt/stack/keystone # set to true to skip installing ironic dependencies diff --git a/playbooks/roles/bifrost-openstack-ci-prep/README.md b/playbooks/roles/bifrost-openstack-ci-prep/README.md index d11e791b7..5f6647d16 100644 --- a/playbooks/roles/bifrost-openstack-ci-prep/README.md +++ b/playbooks/roles/bifrost-openstack-ci-prep/README.md @@ -57,7 +57,7 @@ of the logic to properly handle an OpenStack CI environment node. ci_testing_zuul: true ironic_git_url: /opt/git/openstack/ironic ironicclient_git_url: /opt/git/openstack/python-ironicclient - shade_git_url: /opt/git/openstack-infra/shade + shade_git_url: /opt/git/openstack/shade when: lookup('env', 'ZUUL_BRANCH') != "" - name: "Set ci_testing_zuul_changes if ZUUL_CHANGES is set" set_fact: diff --git a/playbooks/roles/bifrost-prep-for-install/README.md b/playbooks/roles/bifrost-prep-for-install/README.md index e2eba312b..c2c3a88f6 100644 --- a/playbooks/roles/bifrost-prep-for-install/README.md +++ b/playbooks/roles/bifrost-prep-for-install/README.md @@ -23,16 +23,16 @@ git_root: The base location for cloned git repositories. This defaults to "/opt/stack". ironicclient_git_url: URL for ironicclient, defaults to: - https://git.openstack.org/openstack/python-ironicclient + https://opendev.org/openstack/python-ironicclient openstacksdk_git_url: URL for openstacksdk, defaults to: - https://git.openstack.org/openstack/openstacksdk + https://opendev.org/openstack/openstacksdk shade_git_url: URL for shade, defaults to: - https://git.openstack.org/openstack-infra/shade + https://opendev.org/openstack/shade ironic_git_url: URL for ironic, defaults to: - https://git.openstack.org/openstack/ironic + https://opendev.org/openstack/ironic ironicclient_git_folder: The folder to clone ironicclient to if missing, defaults to: "{{ git_root}}/ironicclient.git" diff --git a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml index e3b7462fa..a614957c1 100644 --- a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml +++ b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml @@ -2,16 +2,16 @@ # git_root is the folder where to place downloaded git repos git_root: "/opt/stack" # *_git_url can be overridden by local clones for offline installs -dib_git_url: https://git.openstack.org/openstack/diskimage-builder -ironicclient_git_url: https://git.openstack.org/openstack/python-ironicclient -openstacksdk_git_url: https://git.openstack.org/openstack/openstacksdk -shade_git_url: https://git.openstack.org/openstack-infra/shade -ironic_git_url: https://git.openstack.org/openstack/ironic -ironicinspector_git_url: https://github.com/openstack/ironic-inspector -ironicinspectorclient_git_url: https://github.com/openstack/python-ironic-inspector-client -reqs_git_url: https://git.openstack.org/openstack/requirements -staging_drivers_git_url: https://git.openstack.org/openstack/ironic-staging-drivers -keystone_git_url: https://git.openstack.org/openstack/keystone +dib_git_url: https://opendev.org/openstack/diskimage-builder +ironicclient_git_url: https://opendev.org/openstack/python-ironicclient +openstacksdk_git_url: https://opendev.org/openstack/openstacksdk +shade_git_url: https://opendev.org/openstack/shade +ironic_git_url: https://opendev.org/openstack/ironic +ironicinspector_git_url: https://opendev.org/openstack/ironic-inspector +ironicinspectorclient_git_url: https://opendev.org/openstack/python-ironic-inspector-client +reqs_git_url: https://opendev.org/openstack/requirements +staging_drivers_git_url: https://opendev.org/x/ironic-staging-drivers +keystone_git_url: https://opendev.org/openstack/keystone # *_git_folder can be overridden by local clones for offline installs ironicclient_git_folder: "{{ git_root}}/python-ironicclient" ironic_git_folder: "{{ git_root}}/ironic" diff --git a/playbooks/roles/ironic-enroll-dynamic/README.md b/playbooks/roles/ironic-enroll-dynamic/README.md index 3d0104900..9099bb479 100644 --- a/playbooks/roles/ironic-enroll-dynamic/README.md +++ b/playbooks/roles/ironic-enroll-dynamic/README.md @@ -8,9 +8,9 @@ Requirements ------------ This role is dependent upon the os-ironic ansible module, which is dependent -upon shade (https://git.openstack.org/cgit/openstack-infra/shade/), which in +upon shade (https://opendev.org/openstack/shade/), which in this case is presently dependent upon the Ironic Python Client Library -(https://git.openstack.org/cgit/openstack/python-ironicclient/). +(https://opendev.org/openstack/python-ironicclient/). Role Variables -------------- diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml index 1addf7632..cf78ff3e0 100644 --- a/playbooks/test-bifrost.yaml +++ b/playbooks/test-bifrost.yaml @@ -32,13 +32,13 @@ ironic_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic" ironicclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironicclient" openstacksdk_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/openstacksdk" - shade_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack-infra/shade" + shade_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/shade" dib_git_url: "/opt/git/openstack/diskimage-builder" ironicinspector_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-inspector" ironicinspectorclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironic-inspector-client" keystone_git_url: "/opt/git/openstack/keystone" reqs_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/requirements" - staging_drivers_git_url: "/opt/git/openstack/ironic-staging-drivers" + staging_drivers_git_url: "/opt/git/x/ironic-staging-drivers" # TODO(TheJulia) Fix the above paths to be consistent, because the NV job gets the dib # folder cloned, while the gate job does not. Likely need to work out a semi-hybrid # solution. diff --git a/releasenotes/notes/support-staging-drivers-1c398a56dde9b240.yaml b/releasenotes/notes/support-staging-drivers-1c398a56dde9b240.yaml index e6f574f7a..cf7beaf89 100644 --- a/releasenotes/notes/support-staging-drivers-1c398a56dde9b240.yaml +++ b/releasenotes/notes/support-staging-drivers-1c398a56dde9b240.yaml @@ -4,6 +4,6 @@ features: drivers that are not included in the ironic repo, and provide additional hardware support for ironic. More information about the drivers can be found at - `Ironic-Staging-Drivers `_ + `Ironic-Staging-Drivers `_ To install the staging drivers set `staging_drivers_include` to true. The default value is false. diff --git a/tox.ini b/tox.ini index b2aa599eb..54aa14e38 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ skipsdist = True [testenv] usedevelop = True -install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages} setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning @@ -32,7 +32,7 @@ commands = python setup.py test --coverage --testr-args='{posargs}' [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 -W -b html doc/source doc/build/html @@ -44,7 +44,7 @@ commands = oslo_debug_helper -t bifrost/tests {posargs} [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}/doc/requirements.txt commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html