diff --git a/defaults/main.yml b/defaults/main.yml index 1d1a0a0b..38587b0b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -32,11 +32,11 @@ ceilometer_install_method: "source" ceilometer_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}" ## The git source/branch -ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer +ceilometer_git_repo: https://opendev.org/openstack/ceilometer ceilometer_git_install_branch: master ## The packages to build from source -ceilometer_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}" +ceilometer_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" ceilometer_git_constraints: - "git+{{ ceilometer_git_repo }}@{{ ceilometer_git_install_branch }}#egg=ceilometer" - "--constraint {{ ceilometer_upper_constraints_url }}" diff --git a/doc/source/configure-ceilometer.rst b/doc/source/configure-ceilometer.rst index 81ec9a22..78038dfd 100644 --- a/doc/source/configure-ceilometer.rst +++ b/doc/source/configure-ceilometer.rst @@ -26,7 +26,7 @@ Configure ceilometer by specifying the ``metering-compute_hosts`` and ``metering-infra_hosts`` directives in the ``/etc/openstack_deploy/conf.d/ceilometer.yml`` file: `ceilometer.yml.example -`_ +`_ The ``metering-compute_hosts`` host the ``ceilometer-agent-compute`` service. It runs on each compute node and polls for resource diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 262318cf..93a7b751 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -64,7 +64,7 @@ title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role' # The link to the browsable source code (for the left hand menu) oslosphinx_cgit_link = ( - 'https://git.openstack.org/cgit/openstack/{}'.format(target_name) + 'https://opendev.org/openstack/{}'.format(target_name) ) # Release notes do not need a version number in the title, they