Skip to content

Commit 32e73f5

Browse files
jovialjovial
authored
Merge pull request #3 from stackhpc/merge-upstream-rocky
Merge upstream rocky
2 parents 22eb001 + 0ccdf8e commit 32e73f5

File tree

118 files changed

+3365
-730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+3365
-730
lines changed

‎.zuul.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -534,22 +534,6 @@
534534
- ^tests-py3.txt$
535535
- ^tools/.*$
536536
- ^tox.ini$
537-
- legacy-tempest-dsvm-neutron-full-opensuse-423:
538-
irrelevant-files:
539-
- ^(placement-)?api-.*$
540-
- ^(test-|)requirements.txt$
541-
- ^.*\.rst$
542-
- ^.git.*$
543-
- ^doc/.*$
544-
- ^nova/hacking/.*$
545-
- ^nova/locale/.*$
546-
- ^nova/tests/.*$
547-
- ^releasenotes/.*$
548-
- ^setup.cfg$
549-
- ^tests-py3.txt$
550-
- ^tools/.*$
551-
- ^tox.ini$
552-
553537
post:
554538
jobs:
555539
- openstack-tox-cover

‎api-ref/source/os-volume-attachments.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ Policy defaults enable only users with the administrative role or
149149
the owner of the server to perform this operation. Cloud providers
150150
can change these permissions through the ``policy.json`` file.
151151

152+
Updating, or what is commonly referred to as "swapping", volume attachments
153+
with volumes that have more than one read/write attachment, is not supported.
154+
152155
Normal response codes: 202
153156

154157
Error response codes: badRequest(400), unauthorized(401), forbidden(403), itemNotFound(404), conflict(409)

‎api-ref/source/parameters.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,23 @@ sort_key_flavor:
11541154
Sorts by a flavor attribute. Default attribute is ``flavorid``. You can specify
11551155
multiple pairs of sort key and sort direction query parameters. If you omit the
11561156
sort direction in a pair, the API uses the natural sorting direction of the flavor
1157-
``sort_key`` attribute.
1157+
``sort_key`` attribute. The sort keys are limited to:
1158+
1159+
- ``created_at``
1160+
- ``description``
1161+
- ``disabled``
1162+
- ``ephemeral_gb``
1163+
- ``flavorid``
1164+
- ``id``
1165+
- ``is_public``
1166+
- ``memory_mb``
1167+
- ``name``
1168+
- ``root_gb``
1169+
- ``rxtx_factor``
1170+
- ``swap``
1171+
- ``updated_at``
1172+
- ``vcpu_weight``
1173+
- ``vcpus``
11581174
in: query
11591175
required: false
11601176
type: string

‎doc/api_samples/os-remote-consoles/get-vnc-console-post-resp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"console": {
33
"type": "novnc",
4-
"url": "http://127.0.0.1:6080/vnc_auto.html?token=191996c3-7b0f-42f3-95a7-f1839f2da6ed"
4+
"url": "http://127.0.0.1:6080/vnc_auto.html?path=%3Ftoken%3Ddaae261f-474d-4cae-8f6a-1865278ed8c9"
55
}
66
}

‎doc/api_samples/os-remote-consoles/v2.6/create-vnc-console-resp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"remote_console": {
33
"protocol": "vnc",
44
"type": "novnc",
5-
"url": "http://example.com:6080/vnc_auto.html?token=b60bcfc3-5fd4-4d21-986c-e83379107819"
5+
"url": "http://example.com:6080/vnc_auto.html?path=%3Ftoken%3Db60bcfc3-5fd4-4d21-986c-e83379107819"
66
}
77
}

‎doc/source/admin/figures/SCH_5009_V00_NUAC-VNC_OpenStack.svg

Lines changed: 2 additions & 2 deletions
Loading

‎doc/source/admin/quotas.rst

Lines changed: 107 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,55 @@ To view and update default quota values
6262
.. code-block:: console
6363
6464
$ openstack quota show --default
65+
+----------------------+----------+
66+
| Field | Value |
67+
+----------------------+----------+
68+
| backup-gigabytes | 1000 |
69+
| backups | 10 |
70+
| cores | 20 |
71+
| fixed-ips | -1 |
72+
| floating-ips | 50 |
73+
| gigabytes | 1000 |
74+
| health_monitors | None |
75+
| injected-file-size | 10240 |
76+
| injected-files | 5 |
77+
| injected-path-size | 255 |
78+
| instances | 10 |
79+
| key-pairs | 100 |
80+
| l7_policies | None |
81+
| listeners | None |
82+
| load_balancers | None |
83+
| location | None |
84+
| name | None |
85+
| networks | 10 |
86+
| per-volume-gigabytes | -1 |
87+
| pools | None |
88+
| ports | 50 |
89+
| project | None |
90+
| project_name | project |
91+
| properties | 128 |
92+
| ram | 51200 |
93+
| rbac_policies | 10 |
94+
| routers | 10 |
95+
| secgroup-rules | 100 |
96+
| secgroups | 10 |
97+
| server-group-members | 10 |
98+
| server-groups | 10 |
99+
| snapshots | 10 |
100+
| subnet_pools | -1 |
101+
| subnets | 10 |
102+
| volumes | 10 |
103+
+----------------------+----------+
65104
66-
+-----------------------------+-------+
67-
| Quota | Limit |
68-
+-----------------------------+-------+
69-
| instances | 10 |
70-
| cores | 20 |
71-
| ram | 51200 |
72-
| floating_ips | 10 |
73-
| fixed_ips | -1 |
74-
| metadata_items | 128 |
75-
| injected_files | 5 |
76-
| injected_file_content_bytes | 10240 |
77-
| injected_file_path_bytes | 255 |
78-
| key_pairs | 100 |
79-
| security_groups | 10 |
80-
| security_group_rules | 20 |
81-
| server_groups | 10 |
82-
| server_group_members | 10 |
83-
+-----------------------------+-------+
105+
.. note::
106+
107+
This lists default quotas for all services and not just nova.
84108

85109
#. Update a default value for a new project, for example:
86110

87111
.. code-block:: console
88112
89-
$ openstack quota set --instances 15 default
113+
$ openstack quota set --instances 15 --class default
90114
91115
To view quota values for an existing project
92116
--------------------------------------------
@@ -96,25 +120,50 @@ To view quota values for an existing project
96120
.. code-block:: console
97121
98122
$ openstack quota show PROJECT_NAME
123+
+----------------------+----------------------------------+
124+
| Field | Value |
125+
+----------------------+----------------------------------+
126+
| backup-gigabytes | 1000 |
127+
| backups | 10 |
128+
| cores | 32 |
129+
| fixed-ips | -1 |
130+
| floating-ips | 10 |
131+
| gigabytes | 1000 |
132+
| health_monitors | None |
133+
| injected-file-size | 10240 |
134+
| injected-files | 5 |
135+
| injected-path-size | 255 |
136+
| instances | 10 |
137+
| key-pairs | 100 |
138+
| l7_policies | None |
139+
| listeners | None |
140+
| load_balancers | None |
141+
| location | None |
142+
| name | None |
143+
| networks | 20 |
144+
| per-volume-gigabytes | -1 |
145+
| pools | None |
146+
| ports | 60 |
147+
| project | c8156b55ec3b486193e73d2974196993 |
148+
| project_name | project |
149+
| properties | 128 |
150+
| ram | 65536 |
151+
| rbac_policies | 10 |
152+
| routers | 10 |
153+
| secgroup-rules | 50 |
154+
| secgroups | 50 |
155+
| server-group-members | 10 |
156+
| server-groups | 10 |
157+
| snapshots | 10 |
158+
| subnet_pools | -1 |
159+
| subnets | 20 |
160+
| volumes | 10 |
161+
+----------------------+----------------------------------+
162+
163+
.. note::
164+
165+
This lists quotas for all services and not just nova.
99166

100-
+-----------------------------+-------+
101-
| Quota | Limit |
102-
+-----------------------------+-------+
103-
| instances | 10 |
104-
| cores | 20 |
105-
| ram | 51200 |
106-
| floating_ips | 10 |
107-
| fixed_ips | -1 |
108-
| metadata_items | 128 |
109-
| injected_files | 5 |
110-
| injected_file_content_bytes | 10240 |
111-
| injected_file_path_bytes | 255 |
112-
| key_pairs | 100 |
113-
| security_groups | 10 |
114-
| security_group_rules | 20 |
115-
| server_groups | 10 |
116-
| server_group_members | 10 |
117-
+-----------------------------+-------+
118167

119168
To update quota values for an existing project
120169
----------------------------------------------
@@ -127,34 +176,35 @@ To update quota values for an existing project
127176
128177
#. Update a particular quota value.
129178

179+
To update quotas for a project:
180+
181+
.. code-block:: console
182+
183+
$ openstack quota set --QUOTA_NAME QUOTA_VALUE PROJECT_NAME
184+
185+
To update quotas for a class:
186+
130187
.. code-block:: console
131188
132-
$ openstack quota set --QUOTA_NAME QUOTA_VALUE PROJECT_OR_CLASS
189+
$ openstack quota set --class --QUOTA_NAME QUOTA_VALUE CLASS_NAME
190+
191+
.. note::
192+
193+
Only the ``default`` class is supported by nova.
133194

134195
For example:
135196

136197
.. code-block:: console
137198
138-
$ openstack quota set --floating-ips 20 PROJECT_OR_CLASS
199+
$ openstack quota set --instances 50 PROJECT_NAME
139200
$ openstack quota show PROJECT_NAME
140-
+-----------------------------+-------+
141-
| Quota | Limit |
142-
+-----------------------------+-------+
143-
| instances | 10 |
144-
| cores | 20 |
145-
| ram | 51200 |
146-
| floating_ips | 20 |
147-
| fixed_ips | -1 |
148-
| metadata_items | 128 |
149-
| injected_files | 5 |
150-
| injected_file_content_bytes | 10240 |
151-
| injected_file_path_bytes | 255 |
152-
| key_pairs | 100 |
153-
| security_groups | 10 |
154-
| security_group_rules | 20 |
155-
| server_groups | 10 |
156-
| server_group_members | 10 |
157-
+-----------------------------+-------+
201+
+----------------------+----------------------------------+
202+
| Field | Value |
203+
+----------------------+----------------------------------+
204+
| ... | ... |
205+
| instances | 50 |
206+
| ... | ... |
207+
+----------------------+----------------------------------+
158208
159209
.. note::
160210

‎doc/source/admin/remote-console-access.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ access their instances through VNC clients.
7676
The VNC console connection works as follows:
7777

7878
#. A user connects to the API and gets an ``access_url`` such as,
79-
``http://ip:port/?token=xyz``.
79+
``http://ip:port/?path=%3Ftoken%3Dxyz``.
8080

8181
#. The user pastes the URL in a browser or uses it as a client parameter.
8282

‎doc/source/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@
172172
# -- Options for openstackdocstheme -------------------------------------------
173173

174174
# keep this ordered to keep mriedem happy
175+
#
176+
# NOTE(stephenfin): Projects that don't have a release branch, like TripleO and
177+
# reno, should not be included here
175178
openstack_projects = [
176179
'ceilometer',
177180
'cinder',
@@ -187,7 +190,6 @@
187190
'oslo.versionedobjects',
188191
'python-novaclient',
189192
'python-openstackclient',
190-
'reno',
191193
'watcher',
192194
]
193195
# -- Custom extensions --------------------------------------------------------

‎doc/source/contributor/placement.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@ there are a few bits of required housekeeping that must be done in the code:
146146
microversion and give a very brief summary of the added feature.
147147
* Update ``nova/api/openstack/placement/rest_api_version_history.rst``
148148
to add a more detailed section describing the new microversion.
149-
* Add a :reno-doc:`release note <>` with a ``features`` section announcing the
150-
new or changed feature and the microversion.
149+
* Add a `release note <https://docs.openstack.org/reno/latest/>` with a
150+
``features`` section announcing the new or changed feature and the
151+
microversion.
151152
* If the ``version_handler`` decorator (see below) has been used,
152153
increment ``TOTAL_VERSIONED_METHODS`` in
153154
``nova/tests/unit/api/openstack/placement/test_microversion.py``.

‎doc/source/contributor/releasenotes.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Release Notes
66
What is reno ?
77
--------------
88

9-
Nova uses :reno-doc:`reno <>` for providing release notes in-tree. That means
10-
that a patch can include a *reno file* or a series can have a follow-on change
11-
containing that file explaining what the impact is.
9+
Nova uses `reno <https://docs.openstack.org/reno/latest/>`__ for providing
10+
release notes in-tree. That means that a patch can include a *reno file* or a
11+
series can have a follow-on change containing that file explaining what the
12+
impact is.
1213

1314
A *reno file* is a YAML file written in the ``releasenotes/notes`` tree which
1415
is generated using the *reno* tool this way:
@@ -20,7 +21,9 @@ is generated using the *reno* tool this way:
2021
where usually ``<name-your-file>`` can be ``bp-<blueprint_name>`` for a
2122
blueprint or ``bug-XXXXXX`` for a bugfix.
2223

23-
Refer to the :reno-doc:`reno documentation <user/index.html>` for more information.
24+
Refer to the `reno documentation
25+
<https://docs.openstack.org/reno/latest/user/index.html>`__ for more
26+
information.
2427

2528

2629
When a release note is needed

‎doc/source/contributor/testing/zero-downtime-upgrade.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ claims the virtual IP. You can check which node claimed the virtual IP using:
158158
Zero Downtime upgrade process
159159
------------------------------
160160
161-
General rolling upgrade process: :ref:minimal_downtime_upgrade.
161+
General rolling upgrade process: :ref:`minimal_downtime_upgrade`.
162162
163163
164164
Before Upgrade

‎doc/source/reference/notifications.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ payload.
285285

286286
Note that the notification's publisher instance can be created two different
287287
ways. It can be created by instantiating the `NotificationPublisher` object
288-
with a `host` and a `binary` string parameter or it can be generated from a
288+
with a `host` and a `source` string parameter or it can be generated from a
289289
`Service` object by calling `NotificationPublisher.from_service_obj` function.
290290

291291
Versioned notifications shall have a sample file stored under

‎nova/api/openstack/compute/rest_api_version_history.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Example response::
8484
"remote_console": {
8585
"protocol": "vnc",
8686
"type": "novnc",
87-
"url": "http://example.com:6080/vnc_auto.html?token=XYZ"
87+
"url": "http://example.com:6080/vnc_auto.html?path=%3Ftoken%3DXYZ"
8888
}
8989
}
9090

0 commit comments

Comments
 (0)