openstack
/
trove
Code Issues Proposed changes

Merge "Config admin clients as default"

This commit is contained in:
Zuul 2020-01-19 09:37:31 +00:00 committed by Gerrit Code Review
parent 6fc2c37844 dfe826402b
commit 54987b60a7
8 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/plugin.sh
View File

@ -237,11 +237,6 @@ function configure_trove {
iniset $TROVE_CONF DEFAULT taskmanager_manager trove.taskmanager.manager.Manager
iniset $TROVE_CONF DEFAULT default_datastore $TROVE_DATASTORE_TYPE
iniset $TROVE_CONF DEFAULT remote_nova_client trove.common.clients_admin.nova_client_trove_admin
iniset $TROVE_CONF DEFAULT remote_cinder_client trove.common.clients_admin.cinder_client_trove_admin
iniset $TROVE_CONF DEFAULT remote_neutron_client trove.common.clients_admin.neutron_client_trove_admin
iniset $TROVE_CONF DEFAULT remote_glance_client trove.common.clients_admin.glance_client_trove_admin
iniset $TROVE_CONF cassandra tcp_ports 7000,7001,7199,9042,9160
iniset $TROVE_CONF couchbase tcp_ports 8091,8092,4369,11209-11211,21100-21199
iniset $TROVE_CONF couchdb tcp_ports 5984
@ -275,11 +270,6 @@ function configure_trove {
iniset $TROVE_GUESTAGENT_CONF service_credentials region_name $REGION_NAME
iniset $TROVE_GUESTAGENT_CONF service_credentials auth_url $TROVE_AUTH_ENDPOINT
iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_nova_client trove.common.clients_admin.nova_client_trove_admin
iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_cinder_client trove.common.clients_admin.cinder_client_trove_admin
iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_neutron_client trove.common.clients_admin.neutron_client_trove_admin
iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_glance_client trove.common.clients_admin.glance_client_trove_admin
# 1. To avoid 'Connection timed out' error of sudo command inside the guest agent
# 2. Config the controller IP address used by guest-agent to download Trove code during initialization (only valid for dev_mode=true).
common_cloudinit=/etc/trove/cloudinit/common.cloudinit

0
releasenotes/notes/ussuri-03-add-service-status-updated.yaml → releasenotes/notes/ussuri-add-service-status-updated.yaml
View File

11
releasenotes/notes/ussuri-admin-clients-a14514a835ae11ea.yaml Normal file
View File

@ -0,0 +1,11 @@
---
upgrade:
- |
Trove is now using admin clients by default to communicate with Nova,
Cinder, Neutron and Glance. Deployers want to stick to the old clients need
to explicitly config the following options:
* remote_nova_client
* remote_cinder_client
* remote_neutron_client
* remote_glance_client

0
releasenotes/notes/ussuri-02-database-instance-healthy.yaml → releasenotes/notes/ussuri-database-instance-healthy.yaml
View File

0
releasenotes/notes/ussuri-04-delete-datastoredad784e2345711ea.yaml → releasenotes/notes/ussuri-delete-datastoredad784e2345711ea.yaml
View File

0
releasenotes/notes/ussuri-01-service-credential-config.yaml → releasenotes/notes/ussuri-service-credential-config.yaml
View File

8
trove/common/cfg.py
View File

@ -334,13 +334,13 @@ common_opts = [
default='trove.common.clients.guest_client',
help='Client to send Guest Agent calls to.'),
cfg.StrOpt('remote_nova_client',
default='trove.common.clients.nova_client',
default='trove.common.clients_admin.nova_client_trove_admin',
help='Client to send Nova calls to.'),
cfg.StrOpt('remote_neutron_client',
default='trove.common.clients.neutron_client',
default='trove.common.clients_admin.neutron_client_trove_admin',
help='Client to send Neutron calls to.'),
cfg.StrOpt('remote_cinder_client',
default='trove.common.clients.cinder_client',
default='trove.common.clients_admin.cinder_client_trove_admin',
help='Client to send Cinder calls to.'),
cfg.StrOpt('remote_swift_client',
default='trove.common.clients.swift_client',
@ -349,7 +349,7 @@ common_opts = [
default='trove.common.trove_remote.trove_client',
help='Client to send Trove calls to.'),
cfg.StrOpt('remote_glance_client',
default='trove.common.clients.glance_client',
default='trove.common.clients_admin.glance_client_trove_admin',
help='Client to send Glance calls to.'),
cfg.StrOpt('exists_notification_transformer',
help='Transformer for exists notifications.'),

2
trove/tests/unittests/taskmanager/test_models.py
View File

@ -395,7 +395,7 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest):
@patch.object(taskmanager_models.FreshInstanceTasks, '_build_volume_info')
@patch.object(taskmanager_models.FreshInstanceTasks, '_guest_prepare')
@patch.object(template, 'SingleInstanceConfigTemplate')
@patch('trove.common.clients.neutron_client')
@patch('trove.common.clients_admin.neutron_client_trove_admin')
def test_create_instance_with_mgmt_port(self,
mock_neutron_client,
mock_single_instance_template,