stackhpc · jovial · Oct 23, 2019 · Apr 4, 2019 · Jan 14, 2019 · Feb 7, 2019
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -534,22 +534,6 @@
               - ^tests-py3.txt$
               - ^tools/.*$
               - ^tox.ini$
-        - legacy-tempest-dsvm-neutron-full-opensuse-423:
-            irrelevant-files:
-              - ^(placement-)?api-.*$
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^.git.*$
-              - ^doc/.*$
-              - ^nova/hacking/.*$
-              - ^nova/locale/.*$
-              - ^nova/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tests-py3.txt$
-              - ^tools/.*$
-              - ^tox.ini$
-
     post:
       jobs:
         - openstack-tox-cover
diff --git a/api-ref/source/os-volume-attachments.inc b/api-ref/source/os-volume-attachments.inc
@@ -149,6 +149,9 @@ Policy defaults enable only users with the administrative role or
 the owner of the server to perform this operation. Cloud providers
 can change these permissions through the ``policy.json`` file.
 
+Updating, or what is commonly referred to as "swapping", volume attachments
+with volumes that have more than one read/write attachment, is not supported.
+
 Normal response codes: 202
 
 Error response codes: badRequest(400), unauthorized(401), forbidden(403), itemNotFound(404), conflict(409)

diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
@@ -1154,7 +1154,23 @@ sort_key_flavor:
     Sorts by a flavor attribute. Default attribute is ``flavorid``. You can specify
     multiple pairs of sort key and sort direction query parameters. If you omit the
     sort direction in a pair, the API uses the natural sorting direction of the flavor
-    ``sort_key`` attribute.
+    ``sort_key`` attribute. The sort keys are limited to:
+
+    - ``created_at``
+    - ``description``
+    - ``disabled``
+    - ``ephemeral_gb``
+    - ``flavorid``
+    - ``id``
+    - ``is_public``
+    - ``memory_mb``
+    - ``name``
+    - ``root_gb``
+    - ``rxtx_factor``
+    - ``swap``
+    - ``updated_at``
+    - ``vcpu_weight``
+    - ``vcpus``
   in: query
   required: false
   type: string

diff --git a/doc/api_samples/os-remote-consoles/get-vnc-console-post-resp.json b/doc/api_samples/os-remote-consoles/get-vnc-console-post-resp.json
@@ -1,6 +1,6 @@
 {
     "console": {
         "type": "novnc",
-        "url": "http://127.0.0.1:6080/vnc_auto.html?token=191996c3-7b0f-42f3-95a7-f1839f2da6ed"
+        "url": "http://127.0.0.1:6080/vnc_auto.html?path=%3Ftoken%3Ddaae261f-474d-4cae-8f6a-1865278ed8c9"
     }
 }
diff --git a/doc/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json b/doc/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json
@@ -2,6 +2,6 @@
     "remote_console": {
         "protocol": "vnc",
         "type": "novnc",
-        "url": "http://example.com:6080/vnc_auto.html?token=b60bcfc3-5fd4-4d21-986c-e83379107819"
+        "url": "http://example.com:6080/vnc_auto.html?path=%3Ftoken%3Db60bcfc3-5fd4-4d21-986c-e83379107819"
     }
 }
diff --git a/doc/source/admin/figures/SCH_5009_V00_NUAC-VNC_OpenStack.svg b/doc/source/admin/figures/SCH_5009_V00_NUAC-VNC_OpenStack.svg
diff --git a/doc/source/admin/quotas.rst b/doc/source/admin/quotas.rst
@@ -62,31 +62,55 @@ To view and update default quota values
    .. code-block:: console
 
       $ openstack quota show --default
+      +----------------------+----------+
+      | Field                | Value    |
+      +----------------------+----------+
+      | backup-gigabytes     | 1000     |
+      | backups              | 10       |
+      | cores                | 20       |
+      | fixed-ips            | -1       |
+      | floating-ips         | 50       |
+      | gigabytes            | 1000     |
+      | health_monitors      | None     |
+      | injected-file-size   | 10240    |
+      | injected-files       | 5        |
+      | injected-path-size   | 255      |
+      | instances            | 10       |
+      | key-pairs            | 100      |
+      | l7_policies          | None     |
+      | listeners            | None     |
+      | load_balancers       | None     |
+      | location             | None     |
+      | name                 | None     |
+      | networks             | 10       |
+      | per-volume-gigabytes | -1       |
+      | pools                | None     |
+      | ports                | 50       |
+      | project              | None     |
+      | project_name         | project  |
+      | properties           | 128      |
+      | ram                  | 51200    |
+      | rbac_policies        | 10       |
+      | routers              | 10       |
+      | secgroup-rules       | 100      |
+      | secgroups            | 10       |
+      | server-group-members | 10       |
+      | server-groups        | 10       |
+      | snapshots            | 10       |
+      | subnet_pools         | -1       |
+      | subnets              | 10       |
+      | volumes              | 10       |
+      +----------------------+----------+
 
-      +-----------------------------+-------+
-      | Quota                       | Limit |
-      +-----------------------------+-------+
-      | instances                   | 10    |
-      | cores                       | 20    |
-      | ram                         | 51200 |
-      | floating_ips                | 10    |
-      | fixed_ips                   | -1    |
-      | metadata_items              | 128   |
-      | injected_files              | 5     |
-      | injected_file_content_bytes | 10240 |
-      | injected_file_path_bytes    | 255   |
-      | key_pairs                   | 100   |
-      | security_groups             | 10    |
-      | security_group_rules        | 20    |
-      | server_groups               | 10    |
-      | server_group_members        | 10    |
-      +-----------------------------+-------+
+   .. note::
+
+      This lists default quotas for all services and not just nova.
 
 #. Update a default value for a new project, for example:
 
    .. code-block:: console
 
-      $ openstack quota set --instances 15 default
+      $ openstack quota set --instances 15 --class default
 
 To view quota values for an existing project
 --------------------------------------------
@@ -96,25 +120,50 @@ To view quota values for an existing project
    .. code-block:: console
 
       $ openstack quota show PROJECT_NAME
+      +----------------------+----------------------------------+
+      | Field                | Value                            |
+      +----------------------+----------------------------------+
+      | backup-gigabytes     | 1000                             |
+      | backups              | 10                               |
+      | cores                | 32                               |
+      | fixed-ips            | -1                               |
+      | floating-ips         | 10                               |
+      | gigabytes            | 1000                             |
+      | health_monitors      | None                             |
+      | injected-file-size   | 10240                            |
+      | injected-files       | 5                                |
+      | injected-path-size   | 255                              |
+      | instances            | 10                               |
+      | key-pairs            | 100                              |
+      | l7_policies          | None                             |
+      | listeners            | None                             |
+      | load_balancers       | None                             |
+      | location             | None                             |
+      | name                 | None                             |
+      | networks             | 20                               |
+      | per-volume-gigabytes | -1                               |
+      | pools                | None                             |
+      | ports                | 60                               |
+      | project              | c8156b55ec3b486193e73d2974196993 |
+      | project_name         | project                          |
+      | properties           | 128                              |
+      | ram                  | 65536                            |
+      | rbac_policies        | 10                               |
+      | routers              | 10                               |
+      | secgroup-rules       | 50                               |
+      | secgroups            | 50                               |
+      | server-group-members | 10                               |
+      | server-groups        | 10                               |
+      | snapshots            | 10                               |
+      | subnet_pools         | -1                               |
+      | subnets              | 20                               |
+      | volumes              | 10                               |
+      +----------------------+----------------------------------+
+
+   .. note::
+
+      This lists quotas for all services and not just nova.
 
-      +-----------------------------+-------+
-      | Quota                       | Limit |
-      +-----------------------------+-------+
-      | instances                   | 10    |
-      | cores                       | 20    |
-      | ram                         | 51200 |
-      | floating_ips                | 10    |
-      | fixed_ips                   | -1    |
-      | metadata_items              | 128   |
-      | injected_files              | 5     |
-      | injected_file_content_bytes | 10240 |
-      | injected_file_path_bytes    | 255   |
-      | key_pairs                   | 100   |
-      | security_groups             | 10    |
-      | security_group_rules        | 20    |
-      | server_groups               | 10    |
-      | server_group_members        | 10    |
-      +-----------------------------+-------+
 
 To update quota values for an existing project
 ----------------------------------------------
@@ -127,34 +176,35 @@ To update quota values for an existing project
 
 #. Update a particular quota value.
 
+   To update quotas for a project:
+
+   .. code-block:: console
+
+      $ openstack quota set --QUOTA_NAME QUOTA_VALUE PROJECT_NAME
+
+   To update quotas for a class:
+
    .. code-block:: console
 
-      $ openstack quota set --QUOTA_NAME QUOTA_VALUE PROJECT_OR_CLASS
+      $ openstack quota set --class --QUOTA_NAME QUOTA_VALUE CLASS_NAME
+
+   .. note::
+
+      Only the ``default`` class is supported by nova.
 
    For example:
 
    .. code-block:: console
 
-      $ openstack quota set --floating-ips 20 PROJECT_OR_CLASS
+      $ openstack quota set --instances 50 PROJECT_NAME
       $ openstack quota show PROJECT_NAME
-      +-----------------------------+-------+
-      | Quota                       | Limit |
-      +-----------------------------+-------+
-      | instances                   | 10    |
-      | cores                       | 20    |
-      | ram                         | 51200 |
-      | floating_ips                | 20    |
-      | fixed_ips                   | -1    |
-      | metadata_items              | 128   |
-      | injected_files              | 5     |
-      | injected_file_content_bytes | 10240 |
-      | injected_file_path_bytes    | 255   |
-      | key_pairs                   | 100   |
-      | security_groups             | 10    |
-      | security_group_rules        | 20    |
-      | server_groups               | 10    |
-      | server_group_members        | 10    |
-      +-----------------------------+-------+
+      +----------------------+----------------------------------+
+      | Field                | Value                            |
+      +----------------------+----------------------------------+
+      | ...                  | ...                              |
+      | instances            | 50                               |
+      | ...                  | ...                              |
+      +----------------------+----------------------------------+
 
    .. note::
 

diff --git a/doc/source/admin/remote-console-access.rst b/doc/source/admin/remote-console-access.rst
@@ -76,7 +76,7 @@ access their instances through VNC clients.
 The VNC console connection works as follows:
 
 #. A user connects to the API and gets an ``access_url`` such as,
-   ``http://ip:port/?token=xyz``.
+   ``http://ip:port/?path=%3Ftoken%3Dxyz``.
 
 #. The user pastes the URL in a browser or uses it as a client parameter.
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -172,6 +172,9 @@
 # -- Options for openstackdocstheme -------------------------------------------
 
 # keep this ordered to keep mriedem happy
+#
+# NOTE(stephenfin): Projects that don't have a release branch, like TripleO and
+# reno, should not be included here
 openstack_projects = [
     'ceilometer',
     'cinder',
@@ -187,7 +190,6 @@
     'oslo.versionedobjects',
     'python-novaclient',
     'python-openstackclient',
-    'reno',
     'watcher',
 ]
 # -- Custom extensions --------------------------------------------------------

diff --git a/doc/source/contributor/placement.rst b/doc/source/contributor/placement.rst
@@ -146,8 +146,9 @@ there are a few bits of required housekeeping that must be done in the code:
   microversion and give a very brief summary of the added feature.
 * Update ``nova/api/openstack/placement/rest_api_version_history.rst``
   to add a more detailed section describing the new microversion.
-* Add a :reno-doc:`release note <>` with a ``features`` section announcing the
-  new or changed feature and the microversion.
+* Add a `release note <https://docs.openstack.org/reno/latest/>` with a
+  ``features`` section announcing the new or changed feature and the
+  microversion.
 * If the ``version_handler`` decorator (see below) has been used,
   increment ``TOTAL_VERSIONED_METHODS`` in
   ``nova/tests/unit/api/openstack/placement/test_microversion.py``.

diff --git a/doc/source/contributor/releasenotes.rst b/doc/source/contributor/releasenotes.rst
@@ -6,9 +6,10 @@ Release Notes
 What is reno ?
 --------------
 
-Nova uses :reno-doc:`reno <>` for providing release notes in-tree. That means
-that a patch can include a *reno file* or a series can have a follow-on change
-containing that file explaining what the impact is.
+Nova uses `reno <https://docs.openstack.org/reno/latest/>`__ for providing
+release notes in-tree. That means that a patch can include a *reno file* or a
+series can have a follow-on change containing that file explaining what the
+impact is.
 
 A *reno file* is a YAML file written in the ``releasenotes/notes`` tree which
 is generated using the *reno* tool this way:
@@ -20,7 +21,9 @@ is generated using the *reno* tool this way:
 where usually ``<name-your-file>`` can be ``bp-<blueprint_name>`` for a
 blueprint or ``bug-XXXXXX`` for a bugfix.
 
-Refer to the :reno-doc:`reno documentation <user/index.html>` for more information.
+Refer to the `reno documentation
+<https://docs.openstack.org/reno/latest/user/index.html>`__ for more
+information.
 
 
 When a release note is needed

diff --git a/doc/source/contributor/testing/zero-downtime-upgrade.rst b/doc/source/contributor/testing/zero-downtime-upgrade.rst
@@ -158,7 +158,7 @@ claims the virtual IP. You can check which node claimed the virtual IP using:
 Zero Downtime upgrade process
 ------------------------------
 
-General rolling upgrade process: :ref:minimal_downtime_upgrade.
+General rolling upgrade process: :ref:`minimal_downtime_upgrade`.
 
 
 Before Upgrade

diff --git a/doc/source/reference/notifications.rst b/doc/source/reference/notifications.rst
@@ -285,7 +285,7 @@ payload.
 
 Note that the notification's publisher instance can be created two different
 ways. It can be created by instantiating the `NotificationPublisher` object
-with a `host` and a `binary` string parameter or it can be generated from a
+with a `host` and a `source` string parameter or it can be generated from a
 `Service` object by calling `NotificationPublisher.from_service_obj` function.
 
 Versioned notifications shall have a sample file stored under

diff --git a/nova/api/openstack/compute/rest_api_version_history.rst b/nova/api/openstack/compute/rest_api_version_history.rst
@@ -84,7 +84,7 @@ Example response::
     "remote_console": {
       "protocol": "vnc",
       "type": "novnc",
-      "url": "http://example.com:6080/vnc_auto.html?token=XYZ"
+      "url": "http://example.com:6080/vnc_auto.html?path=%3Ftoken%3DXYZ"
     }
   }