summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Motoki <amotoki@gmail.com>2018-03-20 16:19:57 +0900
committerAkihiro Motoki <amotoki@gmail.com>2018-03-20 16:22:05 +0900
commit64b67ac9e9ec9003ed2d1deb55ada1c9f9a7c779 (patch)
tree18cf24d095f982373c6cb87c62fe8071edb80584
parentda089052b0075a8360afe78175975aec325fe968 (diff)
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
Notes
Notes (review): Code-Review+2: Akihiro Motoki <amotoki@gmail.com> Workflow+1: Akihiro Motoki <amotoki@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 20 Mar 2018 08:59:29 +0000 Reviewed-on: https://review.openstack.org/553825 Project: openstack/horizon Branch: refs/heads/master
-rw-r--r--horizon/middleware/base.py4
-rw-r--r--openstack_dashboard/local/local_settings.py.example6
-rw-r--r--openstack_dashboard/settings.py2
-rw-r--r--openstack_dashboard/static/app/core/openstack-service-api/cinder.service.js9
-rw-r--r--openstack_dashboard/test/integration_tests/config.py2
-rw-r--r--openstack_dashboard/test/integration_tests/horizon.conf2
-rw-r--r--openstack_dashboard/test/settings.py2
-rw-r--r--releasenotes/notes/openstack-profiler-at-developer-dashboard-da1b1556e30aa858.yaml2
8 files changed, 15 insertions, 14 deletions
diff --git a/horizon/middleware/base.py b/horizon/middleware/base.py
index 3b39531..b3e378a 100644
--- a/horizon/middleware/base.py
+++ b/horizon/middleware/base.py
@@ -94,8 +94,8 @@ class HorizonMiddleware(object):
94 '%(cookie_size)sB >= %(max_cookie_size)sB. ' 94 '%(cookie_size)sB >= %(max_cookie_size)sB. '
95 'You need to configure file-based or database-backed ' 95 'You need to configure file-based or database-backed '
96 'sessions instead of cookie-based sessions: ' 96 'sessions instead of cookie-based sessions: '
97 'http://docs.openstack.org/developer/horizon/topics/' 97 'https://docs.openstack.org/horizon/latest/'
98 'deployment.html#session-storage', 98 'admin/sessions.html',
99 { 99 {
100 'user_id': request.session.get( 100 'user_id': request.session.get(
101 'user_id', 'Unknown'), 101 'user_id', 'Unknown'),
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
index 4fbe81e..00526b4 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -790,7 +790,8 @@ SECURITY_GROUP_RULES = {
790# $glance --os-image-api-version 2 help md-namespace-import 790# $glance --os-image-api-version 2 help md-namespace-import
791# $glance-manage db_load_metadefs <directory_with_definition_files> 791# $glance-manage db_load_metadefs <directory_with_definition_files>
792# 792#
793# See Metadata Definitions on: http://docs.openstack.org/developer/glance/ 793# See Metadata Definitions on:
794# https://docs.openstack.org/glance/latest/user/glancemetadefcatalogapi.html
794 795
795# TODO: (david-lyle) remove when plugins support settings natively 796# TODO: (david-lyle) remove when plugins support settings natively
796# Note: This is only used when the Sahara plugin is configured and enabled 797# Note: This is only used when the Sahara plugin is configured and enabled
@@ -903,7 +904,8 @@ ALLOWED_PRIVATE_SUBNET_CIDR = {'ipv4': [], 'ipv6': []}
903# Horizon has the ability to display these extra attributes via this setting. 904# Horizon has the ability to display these extra attributes via this setting.
904# If you'd like to display extra data in the project or user tables, set the 905# If you'd like to display extra data in the project or user tables, set the
905# corresponding dict key to the attribute name, followed by the display name. 906# corresponding dict key to the attribute name, followed by the display name.
906# For more information, see horizon's customization (http://docs.openstack.org/developer/horizon/topics/customizing.html#horizon-customization-module-overrides) 907# For more information, see horizon's customization
908# (https://docs.openstack.org/horizon/latest/configuration/customizing.html#horizon-customization-module-overrides)
907#PROJECT_TABLE_EXTRA_INFO = { 909#PROJECT_TABLE_EXTRA_INFO = {
908# 'phone_num': _('Phone Number'), 910# 'phone_num': _('Phone Number'),
909#} 911#}
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
index b94c47c..455bbeb 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -72,7 +72,7 @@ HORIZON_CONFIG = {
72 'types': ['alert-success', 'alert-info'] 72 'types': ['alert-success', 'alert-info']
73 }, 73 },
74 'bug_url': None, 74 'bug_url': None,
75 'help_url': "http://docs.openstack.org", 75 'help_url': "https://docs.openstack.org/",
76 'exceptions': {'recoverable': exceptions.RECOVERABLE, 76 'exceptions': {'recoverable': exceptions.RECOVERABLE,
77 'not_found': exceptions.NOT_FOUND, 77 'not_found': exceptions.NOT_FOUND,
78 'unauthorized': exceptions.UNAUTHORIZED}, 78 '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 f5d3107..682b4e1 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 @@
284 * { 284 * {
285 * "items": [ 285 * "items": [
286 * { 286 * {
287 * "alias": "NMN", 287 * "alias": "OS-SCH-HNT",
288 * "description": "Multiple network support.", 288 * "description": "Pass arbitrary key/value pairs to the scheduler.",
289 * "links": [], 289 * "links": [],
290 * "name": "Multinic", 290 * "name": "SchedulerHints",
291 * "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1", 291 * "updated": "2013-04-18T00:00:00+00:00"
292 * "updated": "2011-06-09T00:00:00Z"
293 * } 292 * }
294 * ] 293 * ]
295 * } 294 * }
diff --git a/openstack_dashboard/test/integration_tests/config.py b/openstack_dashboard/test/integration_tests/config.py
index 43cb7aa..d90f0c0 100644
--- a/openstack_dashboard/test/integration_tests/config.py
+++ b/openstack_dashboard/test/integration_tests/config.py
@@ -20,7 +20,7 @@ DashboardGroup = [
20 default='http://localhost/', 20 default='http://localhost/',
21 help="Where the dashboard can be found"), 21 help="Where the dashboard can be found"),
22 cfg.StrOpt('help_url', 22 cfg.StrOpt('help_url',
23 default='http://docs.openstack.org/', 23 default='https://docs.openstack.org/',
24 help="Dashboard help page url"), 24 help="Dashboard help page url"),
25] 25]
26 26
diff --git a/openstack_dashboard/test/integration_tests/horizon.conf b/openstack_dashboard/test/integration_tests/horizon.conf
index 9f5de9f..635f982 100644
--- a/openstack_dashboard/test/integration_tests/horizon.conf
+++ b/openstack_dashboard/test/integration_tests/horizon.conf
@@ -7,7 +7,7 @@
7dashboard_url=http://localhost/dashboard/ 7dashboard_url=http://localhost/dashboard/
8 8
9# Dashboard help page url (string value) 9# Dashboard help page url (string value)
10help_url=http://docs.openstack.org/ 10help_url=https://docs.openstack.org/
11 11
12[selenium] 12[selenium]
13# Timeout in seconds to wait for a page to become available 13# 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 2af8dab..39a042f 100644
--- a/openstack_dashboard/test/settings.py
+++ b/openstack_dashboard/test/settings.py
@@ -100,7 +100,7 @@ HORIZON_CONFIG = {
100 "help_text": "Password must be between 8 and 18 characters." 100 "help_text": "Password must be between 8 and 18 characters."
101 }, 101 },
102 'user_home': None, 102 'user_home': None,
103 'help_url': "http://docs.openstack.org", 103 'help_url': "https://docs.openstack.org/",
104 'exceptions': {'recoverable': exceptions.RECOVERABLE, 104 'exceptions': {'recoverable': exceptions.RECOVERABLE,
105 'not_found': exceptions.NOT_FOUND, 105 'not_found': exceptions.NOT_FOUND,
106 'unauthorized': exceptions.UNAUTHORIZED}, 106 '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 3aa97d6..734db10 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 @@
2features: 2features:
3 - A new Profiler panel in the Developer dashboard is 3 - A new Profiler panel in the Developer dashboard is
4 introduced. It integrates 4 introduced. It integrates
5 `osprofiler library <http://docs.openstack.org/developer/osprofiler/>`_ 5 `osprofiler library <https://docs.openstack.org/osprofiler/latest/>`_
6 into horizon, thus implementing 6 into horizon, thus implementing
7 `blueprint openstack-profiler-at-developer-dashboard <https://blueprints.launchpad.net/horizon/+spec/openstack-profiler-at-developer-dashboard>`_. 7 `blueprint openstack-profiler-at-developer-dashboard <https://blueprints.launchpad.net/horizon/+spec/openstack-profiler-at-developer-dashboard>`_.
8 Initially profiler is disabled. To enable it the value 8 Initially profiler is disabled. To enable it the value