Skip to content

Commit 7e64f55

Browse files
priteaupriteau
authored
Merge pull request #257 from stackhpc/upstream/master-2026-03-23
Synchronise master with upstream
2 parents b2930b0 + 75ca7d5 commit 7e64f55

6 files changed

Lines changed: 74 additions & 45 deletions

File tree

‎devstack/lib/magnum‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
# - magnum_configure_flavor
2020
# - start_magnum
2121
# - configure_iptables_magnum
22-
# - configure_apache_magnum
2322
# - stop_magnum
2423
# - cleanup_magnum
2524

@@ -372,45 +371,6 @@ function configure_iptables_magnum {
372371
fi
373372
}
374373

375-
function configure_apache_magnum {
376-
# Set redirection for kubernetes openstack cloud provider
377-
# FIXME: When [1] is in kubernetes, we won't need the redirection anymore.
378-
# [1] https://github.com/gophercloud/gophercloud/pull/423
379-
HTACCESS_PATH=/var/www/html
380-
if is_ubuntu; then
381-
OVERRIDE_CONF_FILE=/etc/apache2/apache2.conf
382-
elif is_fedora; then
383-
OVERRIDE_CONF_FILE=/etc/httpd/conf/httpd.conf
384-
fi
385-
# If horizon is enabled then we need
386-
if is_service_enabled horizon; then
387-
HTACCESS_PATH=$DEST/horizon/.blackhole
388-
sudo tee -a $APACHE_CONF_DIR/horizon.conf <<EOF
389-
<Directory $HTACCESS_PATH>
390-
Options Indexes FollowSymLinks
391-
AllowOverride all
392-
Require all granted
393-
</Directory>
394-
EOF
395-
else
396-
sudo tee -a $OVERRIDE_CONF_FILE <<EOF
397-
<Directory $HTACCESS_PATH>
398-
Options Indexes FollowSymLinks
399-
AllowOverride all
400-
Require all granted
401-
</Directory>
402-
EOF
403-
fi
404-
405-
sudo mkdir -p $HTACCESS_PATH
406-
sudo tee $HTACCESS_PATH/.htaccess <<EOF
407-
RewriteEngine on
408-
RewriteRule ^v2\.0(.*) /identity/v2.0\$1
409-
RewriteRule ^v3(.*) /identity/v3\$1
410-
EOF
411-
enable_apache_mod rewrite
412-
}
413-
414374
# start_magnum() - Start running processes, including screen
415375
function start_magnum {
416376

‎devstack/plugin.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ if is_service_enabled magnum-api magnum-cond; then
4646
start_magnum
4747

4848
configure_iptables_magnum
49-
configure_apache_magnum
5049
fi
5150

5251
if [[ "$1" == "unstack" ]]; then

‎magnum/api/attr_validator.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from glanceclient import exc as glance_exception
1616
from novaclient import exceptions as nova_exception
17+
from oslo_utils import strutils
1718

1819
from magnum.api import utils as api_utils
1920
from magnum.common import clients
@@ -180,6 +181,9 @@ def validate_master_count(context, cluster):
180181
def validate_flavor_root_volume_size(cli, flavor, boot_volume_size):
181182
"""Validate flavor root volume size."""
182183

184+
boot_volume_size = strutils.validate_integer(boot_volume_size,
185+
"boot_volume_size")
186+
183187
if boot_volume_size > 0:
184188
return
185189

‎releasenotes/notes/fix-boot-volume-size-label-type-a5625def4c6db32b.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
The boot_volume_size label value is passed as a string from the API.
5+
The validator now converts it to an integer before comparison.

‎releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: magnum\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2026-01-07 23:05+0000\n"
12+
"POT-Creation-Date: 2026-03-17 09:19+0000\n"
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=UTF-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
@@ -99,9 +99,6 @@ msgstr "2024.2 Series Release Notes"
9999
msgid "21.0.0"
100100
msgstr "21.0.0"
101101

102-
msgid "21.0.0-11"
103-
msgstr "21.0.0-11"
104-
105102
msgid "3.0.0"
106103
msgstr "3.0.0"
107104

‎releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Gérald LONLAS <g.lonlas@gmail.com>, 2016. #zanata
2+
msgid ""
3+
msgstr ""
4+
"Project-Id-Version: magnum\n"
5+
"Report-Msgid-Bugs-To: \n"
6+
"POT-Creation-Date: 2026-03-17 09:19+0000\n"
7+
"MIME-Version: 1.0\n"
8+
"Content-Type: text/plain; charset=UTF-8\n"
9+
"Content-Transfer-Encoding: 8bit\n"
10+
"PO-Revision-Date: 2016-10-22 04:59+0000\n"
11+
"Last-Translator: Gérald LONLAS <g.lonlas@gmail.com>\n"
12+
"Language-Team: French\n"
13+
"Language: fr\n"
14+
"X-Generator: Zanata 4.3.3\n"
15+
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
16+
17+
msgid ""
18+
"--keypair-id parameter in magnum CLI cluster-template-create has been "
19+
"renamed to --keypair."
20+
msgstr ""
21+
"Le paramètre --keypair-id dans cluster-template-create du CLI magnum a été "
22+
"renommé pour --keypair."
23+
24+
msgid "3.0.0"
25+
msgstr "3.0.0"
26+
27+
msgid "3.1.0"
28+
msgstr "3.1.0"
29+
30+
msgid ":ref:`genindex`"
31+
msgstr ":ref:`genindex`"
32+
33+
msgid ":ref:`search`"
34+
msgstr ":ref:`search`"
35+
36+
msgid "Contents:"
37+
msgstr "Contenu :"
38+
39+
msgid "Current Series Release Notes"
40+
msgstr "Note de la release actuelle"
41+
42+
msgid "Deprecation Notes"
43+
msgstr "Notes dépréciées "
44+
45+
msgid "Indices and tables"
46+
msgstr "Index et table des matières"
47+
48+
msgid "New Features"
49+
msgstr "Nouvelles fonctionnalités"
50+
51+
msgid "Newton Series Release Notes"
52+
msgstr "Note de release pour Newton"
53+
54+
msgid "Security Issues"
55+
msgstr "Problèmes de sécurités"
56+
57+
msgid "Upgrade Notes"
58+
msgstr "Notes de mises à jours"
59+
60+
msgid "Welcome to Magnum Release Notes's documentation!"
61+
msgstr "Bienvenue dans la documentation de la note de Release de Magnum"
62+
63+
msgid "[1] https://review.openstack.org/#/c/311476/"
64+
msgstr "[1] https://review.openstack.org/#/c/311476/"

0 commit comments

Comments
 (0)