x/packstack
Code Issues Proposed changes

Merge "manila: Drop leftover of nova-network"

Browse Source
This commit is contained in:
Zuul 2024-10-04 11:31:35 +00:00 committed by Gerrit Code Review
commit d6bff4e36c
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/packstack.rst
View File

@ -655,7 +655,7 @@ Manila Network configuration
---------------------------- ----------------------------
**CONFIG_MANILA_NETWORK_TYPE** **CONFIG_MANILA_NETWORK_TYPE**
Type of networking that the backend will use. A more detailed description of each option is available in the Manila docs. Defaults to 'neutron'. ['neutron', 'nova-network', 'standalone'] Type of networking that the backend will use. A more detailed description of each option is available in the Manila docs. Defaults to 'neutron'. ['neutron', 'standalone']
Manila Standalone network configuration Manila Standalone network configuration
--------------------------------------- ---------------------------------------

2
packstack/plugins/manila_355.py
View File

@ -297,7 +297,7 @@ def initConfig(controller):
"MANILANETWORK": [ "MANILANETWORK": [
{"CMD_OPTION": "manila-network-type", {"CMD_OPTION": "manila-network-type",
"PROMPT": ("Enter a network type"), "PROMPT": ("Enter a network type"),
"OPTION_LIST": ['neutron', 'nova-network', 'standalone'], "OPTION_LIST": ['neutron', 'standalone'],
"VALIDATORS": [validators.validate_options], "VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": "neutron", "DEFAULT_VALUE": "neutron",
"MASK_INPUT": False, "MASK_INPUT": False,

37
packstack/puppet/modules/packstack/manifests/manila/network.pp
View File

@ -2,27 +2,26 @@
define packstack::manila::network ($backend_name = $name) { define packstack::manila::network ($backend_name = $name) {
$manila_network_type = lookup('CONFIG_MANILA_NETWORK_TYPE') $manila_network_type = lookup('CONFIG_MANILA_NETWORK_TYPE')
if ($manila_network_type == 'neutron'){ case $manila_network_type {
class { 'manila::network::neutron': 'neutron': {
auth_type => 'password', class { 'manila::network::neutron':
auth_url => lookup('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'), auth_type => 'password',
password => lookup('CONFIG_NEUTRON_KS_PW'), auth_url => lookup('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => lookup('CONFIG_NEUTRON_KS_PW'),
}
} }
} 'standalone': {
elsif ($manila_network_type == 'nova-network'){ manila::network::standalone{ $backend_name:
manila::network::nova_network{ $backend_name: } standalone_network_plugin_gateway => lookup('CONFIG_MANILA_NETWORK_STANDALONE_GATEWAY'),
} standalone_network_plugin_mask => lookup('CONFIG_MANILA_NETWORK_STANDALONE_NETMASK'),
elsif ($manila_network_type == 'standalone'){ standalone_network_plugin_segmentation_id => lookup('CONFIG_MANILA_NETWORK_STANDALONE_SEG_ID'),
manila::network::standalone{ $backend_name: standalone_network_plugin_allowed_ip_ranges => lookup('CONFIG_MANILA_NETWORK_STANDALONE_IP_RANGE'),
standalone_network_plugin_gateway => lookup('CONFIG_MANILA_NETWORK_STANDALONE_GATEWAY'), standalone_network_plugin_ip_version => lookup('CONFIG_MANILA_NETWORK_STANDALONE_IP_VERSION'),
standalone_network_plugin_mask => lookup('CONFIG_MANILA_NETWORK_STANDALONE_NETMASK'), }
standalone_network_plugin_segmentation_id => lookup('CONFIG_MANILA_NETWORK_STANDALONE_SEG_ID'), }
standalone_network_plugin_allowed_ip_ranges => lookup('CONFIG_MANILA_NETWORK_STANDALONE_IP_RANGE'), default: {
standalone_network_plugin_ip_version => lookup('CONFIG_MANILA_NETWORK_STANDALONE_IP_VERSION'), fail("The value ${manila_network_type} is not a valid value for the Manila network type.")
} }
}
else {
fail("The value ${manila_network_type} is not a valid value for the Manila network type.")
} }
} }