Commit f581a3d
Use apache to run neutron api
The monolithic neutron-server service was removed due to removal of
eventlet library.
Also enable quiet mode in ssh-keyscan command to omit garbage records.
Co-Authored-By: Harald Jensås <hjensas@redhat.com>
Depends-On: https://review.opendev.org/c/openstack/puppet-neutron/+/963364
Change-Id: I8304673138de5620e66009d71df68992a729d6df
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>1 parent 9d3df63 commit f581a3d
3 files changed
Lines changed: 30 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -271,7 +271,7 @@ def gather_host_keys(config, messages): | |||
| 271 | 271 | ||
| 272 | 272 | for host in compute_hosts: | |
| 273 | 273 | local = utils.ScriptRunner() | |
| 274 | - local.append('ssh-keyscan %s' % host) | ||
| 274 | + local.append('ssh-keyscan -q %s' % host) | ||
| 275 | 275 | retcode, hostkey = local.execute() | |
| 276 | 276 | config['HOST_KEYS_%s' % host] = hostkey | |
| 277 | 277 | ||
Lines changed: 26 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -20,12 +20,33 @@ | |||
| 20 | 20 | }) | |
| 21 | 21 | } | |
| 22 | 22 | ||
| 23 | + $rpc_workrers = lookup('CONFIG_NEUTRON_L2_AGENT') ? { | ||
| 24 | + 'ovn' => 0, | ||
| 25 | + default => lookup('CONFIG_SERVICE_WORKERS'), | ||
| 26 | + } | ||
| 27 | + $rpc_service_name = $rpc_workers ? { | ||
| 28 | + 0 => false, | ||
| 29 | + default => undef, | ||
| 30 | + } | ||
| 31 | + $rpc_state_report_workers = lookup('CONFIG_NEUTRON_L2_AGENT') ? { | ||
| 32 | + 'ovn' => 0, | ||
| 33 | + default => undef, | ||
| 34 | + } | ||
| 35 | + | ||
| 36 | + class { 'neutron::wsgi::apache': | ||
| 37 | + bind_host => $bind_host, | ||
| 38 | + ssl => false, | ||
| 39 | + workers => lookup('CONFIG_SERVICE_WORKERS'), | ||
| 40 | + } | ||
| 23 | 41 | class { 'neutron::server': | |
| 24 | - sync_db => true, | ||
| 25 | - enabled => true, | ||
| 26 | - api_workers => lookup('CONFIG_SERVICE_WORKERS'), | ||
| 27 | - rpc_workers => lookup('CONFIG_SERVICE_WORKERS'), | ||
| 28 | - service_providers => lookup('SERVICE_PROVIDERS', { merge => 'unique' }), | ||
| 42 | + sync_db => true, | ||
| 43 | + enabled => true, | ||
| 44 | + api_workers => lookup('CONFIG_SERVICE_WORKERS'), | ||
| 45 | + rpc_workers => $rpc_workers, | ||
| 46 | + rpc_state_report_workers => $rpc_state_report_workers, | ||
| 47 | + api_service_name => 'httpd', | ||
| 48 | + rpc_service_name => $rpc_service_name, | ||
| 49 | + service_providers => lookup('SERVICE_PROVIDERS', { merge => 'unique' }), | ||
| 29 | 50 | } | |
| 30 | 51 | ||
| 31 | 52 | if $neutron_vpnaas_enabled { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,10 +22,11 @@ | |||
| 22 | 22 | 'database' => 'placement', | |
| 23 | 23 | }) | |
| 24 | 24 | } | |
| 25 | - | ||
| 26 | 25 | include placement::db::sync | |
| 27 | - include placement::api | ||
| 28 | 26 | ||
| 27 | + class { 'placement::api': | ||
| 28 | + api_service_name => 'httpd', | ||
| 29 | + } | ||
| 29 | 30 | class { 'placement::wsgi::apache': | |
| 30 | 31 | bind_host => $bind_host, | |
| 31 | 32 | ssl => false, | |
0 commit comments