From 64b67ac9e9ec9003ed2d1deb55ada1c9f9a7c779 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Tue, 20 Mar 2018 16:19:57 +0900 Subject: [PATCH] Update the doc links to the newest ones The docstring of getExtensions service in cinder.service.js was a copy from nova service and not correct. The docstring was updated based on the current cinder v2 API. Thanks to a recent improvement in reno, touching release notes in older releases in the master branch no longer polute the rendered release notes. Changing URLs (or other things) in the master branch does not affect the rendered release notes, but updating URLs to the latest would help avoiding mechanical patches of updating links :) Change-Id: I2aec3adeb400323d42a3a5083f8bc0798eeff917 --- horizon/middleware/base.py | 4 ++-- openstack_dashboard/local/local_settings.py.example | 6 ++++-- openstack_dashboard/settings.py | 2 +- .../app/core/openstack-service-api/cinder.service.js | 9 ++++----- openstack_dashboard/test/integration_tests/config.py | 2 +- openstack_dashboard/test/integration_tests/horizon.conf | 2 +- openstack_dashboard/test/settings.py | 2 +- ...profiler-at-developer-dashboard-da1b1556e30aa858.yaml | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/horizon/middleware/base.py b/horizon/middleware/base.py index 3b39531ebd..b3e378af31 100644 --- a/horizon/middleware/base.py +++ b/horizon/middleware/base.py @@ -94,8 +94,8 @@ class HorizonMiddleware(object): '%(cookie_size)sB >= %(max_cookie_size)sB. ' 'You need to configure file-based or database-backed ' 'sessions instead of cookie-based sessions: ' - 'http://docs.openstack.org/developer/horizon/topics/' - 'deployment.html#session-storage', + 'https://docs.openstack.org/horizon/latest/' + 'admin/sessions.html', { 'user_id': request.session.get( 'user_id', 'Unknown'), diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example index 4fbe81ef0b..00526b4851 100644 --- a/openstack_dashboard/local/local_settings.py.example +++ b/openstack_dashboard/local/local_settings.py.example @@ -790,7 +790,8 @@ SECURITY_GROUP_RULES = { # $glance --os-image-api-version 2 help md-namespace-import # $glance-manage db_load_metadefs # -# See Metadata Definitions on: http://docs.openstack.org/developer/glance/ +# See Metadata Definitions on: +# https://docs.openstack.org/glance/latest/user/glancemetadefcatalogapi.html # TODO: (david-lyle) remove when plugins support settings natively # Note: This is only used when the Sahara plugin is configured and enabled @@ -903,7 +904,8 @@ ALLOWED_PRIVATE_SUBNET_CIDR = {'ipv4': [], 'ipv6': []} # Horizon has the ability to display these extra attributes via this setting. # If you'd like to display extra data in the project or user tables, set the # corresponding dict key to the attribute name, followed by the display name. -# For more information, see horizon's customization (http://docs.openstack.org/developer/horizon/topics/customizing.html#horizon-customization-module-overrides) +# For more information, see horizon's customization +# (https://docs.openstack.org/horizon/latest/configuration/customizing.html#horizon-customization-module-overrides) #PROJECT_TABLE_EXTRA_INFO = { # 'phone_num': _('Phone Number'), #} diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py index b94c47c54e..455bbebfdc 100644 --- a/openstack_dashboard/settings.py +++ b/openstack_dashboard/settings.py @@ -72,7 +72,7 @@ HORIZON_CONFIG = { 'types': ['alert-success', 'alert-info'] }, 'bug_url': None, - 'help_url': "http://docs.openstack.org", + 'help_url': "https://docs.openstack.org/", 'exceptions': {'recoverable': exceptions.RECOVERABLE, 'not_found': exceptions.NOT_FOUND, 'unauthorized': exceptions.UNAUTHORIZED}, diff --git a/openstack_dashboard/static/app/core/openstack-service-api/cinder.service.js b/openstack_dashboard/static/app/core/openstack-service-api/cinder.service.js index f5d3107f94..682b4e1aa8 100644 --- a/openstack_dashboard/static/app/core/openstack-service-api/cinder.service.js +++ b/openstack_dashboard/static/app/core/openstack-service-api/cinder.service.js @@ -284,12 +284,11 @@ * { * "items": [ * { - * "alias": "NMN", - * "description": "Multiple network support.", + * "alias": "OS-SCH-HNT", + * "description": "Pass arbitrary key/value pairs to the scheduler.", * "links": [], - * "name": "Multinic", - * "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1", - * "updated": "2011-06-09T00:00:00Z" + * "name": "SchedulerHints", + * "updated": "2013-04-18T00:00:00+00:00" * } * ] * } diff --git a/openstack_dashboard/test/integration_tests/config.py b/openstack_dashboard/test/integration_tests/config.py index 43cb7aab49..d90f0c022f 100644 --- a/openstack_dashboard/test/integration_tests/config.py +++ b/openstack_dashboard/test/integration_tests/config.py @@ -20,7 +20,7 @@ DashboardGroup = [ default='http://localhost/', help="Where the dashboard can be found"), cfg.StrOpt('help_url', - default='http://docs.openstack.org/', + default='https://docs.openstack.org/', help="Dashboard help page url"), ] diff --git a/openstack_dashboard/test/integration_tests/horizon.conf b/openstack_dashboard/test/integration_tests/horizon.conf index 9f5de9fcf1..635f982fd6 100644 --- a/openstack_dashboard/test/integration_tests/horizon.conf +++ b/openstack_dashboard/test/integration_tests/horizon.conf @@ -7,7 +7,7 @@ dashboard_url=http://localhost/dashboard/ # Dashboard help page url (string value) -help_url=http://docs.openstack.org/ +help_url=https://docs.openstack.org/ [selenium] # Timeout in seconds to wait for a page to become available diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py index 2af8dabc2f..39a042f6b4 100644 --- a/openstack_dashboard/test/settings.py +++ b/openstack_dashboard/test/settings.py @@ -100,7 +100,7 @@ HORIZON_CONFIG = { "help_text": "Password must be between 8 and 18 characters." }, 'user_home': None, - 'help_url': "http://docs.openstack.org", + 'help_url': "https://docs.openstack.org/", 'exceptions': {'recoverable': exceptions.RECOVERABLE, 'not_found': exceptions.NOT_FOUND, 'unauthorized': exceptions.UNAUTHORIZED}, diff --git a/releasenotes/notes/openstack-profiler-at-developer-dashboard-da1b1556e30aa858.yaml b/releasenotes/notes/openstack-profiler-at-developer-dashboard-da1b1556e30aa858.yaml index 3aa97d65d1..734db10fc5 100644 --- a/releasenotes/notes/openstack-profiler-at-developer-dashboard-da1b1556e30aa858.yaml +++ b/releasenotes/notes/openstack-profiler-at-developer-dashboard-da1b1556e30aa858.yaml @@ -2,7 +2,7 @@ features: - A new Profiler panel in the Developer dashboard is introduced. It integrates - `osprofiler library `_ + `osprofiler library `_ into horizon, thus implementing `blueprint openstack-profiler-at-developer-dashboard `_. Initially profiler is disabled. To enable it the value