Align stars to fix CI
1) Remove sriov_agent_required The sriov agent is enabled by default since Mitaka and this configuration option has been removed from the upstream modules. It had previous been deprecated by I01bdda6df995f3b09fc55e6b1a016246b68eea26 and was removed in Ib7c36e1a74a1e301f306bcfb884449bbedd1ef70 2) Add cell v2 setup Nova has added cell v2 as a requirement for Ocata so we need to ensure it properly gets setup as part of the install. This includes passing the nova amqp information to the mysql service setup. 3) Remove enable_v1 and enable_v2 lbaas params The enable_v1 and enable_v2 params were deprecated upstream in I1c032c53b61face152bb37dfac4646db11403e4e and removed in Ibad528ad783355236c384d037fe3ffb7d484538f. Change-Id: I15c0568a92acb2c6a545692e96d8ab9260dbf564
This commit is contained in:
parent
79f4846d95
commit
a64f86e3a0
|
@ -864,9 +864,6 @@ Neutron ML2 plugin config
|
|||
**CONFIG_NEUTRON_ML2_VNI_RANGES**
|
||||
Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges of VXLAN VNI IDs that are available for tenant network allocation. Minimum value is 0 and maximum value is 16777215.
|
||||
|
||||
**CONFIG_NEUTRON_ML2_SRIOV_AGENT_REQUIRED**
|
||||
Specify 'y' if the sriov agent is required
|
||||
|
||||
**CONFIG_NEUTRON_ML2_SRIOV_INTERFACE_MAPPINGS**
|
||||
Comma-separated list of interface mappings for the OpenStack Networking ML2 SRIOV agent. Each tuple in the list must be in the format <physical_network>:<net_interface>. Example: physnet1:eth1,physnet2:eth2,physnet3:eth3.
|
||||
|
||||
|
|
|
@ -375,18 +375,6 @@ def initConfig(controller):
|
|||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-neutron-ml2-sriov-agent-required",
|
||||
"CONF_NAME": "CONFIG_NEUTRON_ML2_SRIOV_AGENT_REQUIRED",
|
||||
"PROMPT": ("Set to y if the sriov agent is required"),
|
||||
"OPTION_LIST": ["y", "n"],
|
||||
"VALIDATORS": [validators.validate_options],
|
||||
"DEFAULT_VALUE": "n",
|
||||
"MASK_INPUT": False,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"USE_DEFAULT": False,
|
||||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-neutron-ml2-sriov-interface-mappings",
|
||||
"PROMPT": ("Enter a comma separated list of interface mappings "
|
||||
"for the Neutron ML2 sriov agent"),
|
||||
|
@ -495,11 +483,6 @@ def initSequences(controller):
|
|||
compute_hosts = split_hosts(config['CONFIG_COMPUTE_HOSTS'])
|
||||
q_hosts = api_hosts | network_hosts | compute_hosts
|
||||
|
||||
if config['CONFIG_NEUTRON_ML2_SRIOV_AGENT_REQUIRED'] == 'y':
|
||||
config['CONFIG_NEUTRON_ML2_SRIOV_AGENT_REQUIRED'] = True
|
||||
else:
|
||||
config['CONFIG_NEUTRON_ML2_SRIOV_AGENT_REQUIRED'] = False
|
||||
|
||||
neutron_steps = [
|
||||
{'title': 'Preparing Neutron LBaaS Agent entries',
|
||||
'functions': [create_lbaas_manifests]},
|
||||
|
|
|
@ -100,6 +100,17 @@ class packstack::mariadb::services ()
|
|||
host => '%',
|
||||
allowed_hosts => '%',
|
||||
charset => 'utf8',
|
||||
setup_cell0 => true,
|
||||
}
|
||||
class { '::nova::db::sync_cell_v2':
|
||||
transport_url => os_transport_url({
|
||||
'transport' => 'rabbit',
|
||||
'hosts' => [hiera('CONFIG_AMQP_HOST_URL')],
|
||||
'port' => hiera('CONFIG_AMQP_CLIENTS_PORT'),
|
||||
'username' => hiera('CONFIG_AMQP_AUTH_USER'),
|
||||
'password' => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
|
||||
'ssl' => sprintf('%s', hiera('CONFIG_AMQP_SSL_ENABLED')),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,8 +4,6 @@ class packstack::neutron::lbaas ()
|
|||
interface_driver => hiera('CONFIG_NEUTRON_LBAAS_INTERFACE_DRIVER'),
|
||||
device_driver => 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
||||
user_group => 'haproxy',
|
||||
enable_v1 => false,
|
||||
enable_v2 => true,
|
||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,7 +18,6 @@ class packstack::neutron::ml2 ()
|
|||
enable_security_group => true,
|
||||
firewall_driver => hiera('FIREWALL_DRIVER'),
|
||||
supported_pci_vendor_devs => hiera_array('CONFIG_NEUTRON_ML2_SUPPORTED_PCI_VENDOR_DEVS'),
|
||||
sriov_agent_required => hiera('CONFIG_NEUTRON_ML2_SRIOV_AGENT_REQUIRED'),
|
||||
}
|
||||
|
||||
# For cases where "neutron-db-manage upgrade" command is called
|
||||
|
|
Loading…
Reference in New Issue