diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2019-10-01 23:41:52 +1300 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2019-10-02 22:15:48 +1300 |
| commit | 32de39fa4d13098a4326a241c0cd43349134a4a5 (patch) | |
| tree | 11bb03dd26f0bad48aa8db047cf561be4bc22e26 /devstack | |
| parent | 5bfa414223092961b48ffdf31ff7b4aac04c0e0a (diff) | |
| download | trove-32de39fa4d13098a4326a241c0cd43349134a4a5.tar.gz | |
Use correct Swift credential for instance backup
DevStack is deploying Trove in service tenant model, for swift backed
instance backup, the swift container should be transparent to the end
users.
Story: 2006647
Task: 36883
Change-Id: I5859f4c9911fc2c129c8f23611c6607044fbc145
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e6afa5c2..f5ee71ec 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -200,7 +200,7 @@ function configure_trove { cp $TROVE_LOCAL_API_PASTE_INI $TROVE_API_PASTE_INI # (Re)create trove conf files - rm -f $TROVE_CONF + rm -f $TROVE_CONF $TROVE_GUESTAGENT_CONF TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION @@ -238,6 +238,7 @@ function configure_trove { iniset $TROVE_CONF DEFAULT remote_nova_client trove.common.single_tenant_remote.nova_client_trove_admin iniset $TROVE_CONF DEFAULT remote_cinder_client trove.common.single_tenant_remote.cinder_client_trove_admin iniset $TROVE_CONF DEFAULT remote_neutron_client trove.common.single_tenant_remote.neutron_client_trove_admin + iniset $TROVE_CONF DEFAULT remote_swift_client trove.common.single_tenant_remote.swift_client_trove_admin iniset $TROVE_CONF DEFAULT default_datastore $TROVE_DATASTORE_TYPE iniset $TROVE_CONF cassandra tcp_ports 7000,7001,7199,9042,9160 @@ -271,6 +272,16 @@ function configure_trove { iniset $TROVE_GUESTAGENT_CONF DEFAULT ignore_users os_admin iniset $TROVE_GUESTAGENT_CONF DEFAULT log_dir /var/log/trove/ iniset $TROVE_GUESTAGENT_CONF DEFAULT log_file trove-guestagent.log + iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_user trove + iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_tenant_name $SERVICE_PROJECT_NAME + iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_pass $SERVICE_PASSWORD + iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_user_domain_name default + iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_project_domain_name default + iniset $TROVE_GUESTAGENT_CONF DEFAULT os_region_name $REGION_NAME + iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_nova_client trove.common.single_tenant_remote.nova_client_trove_admin + iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_cinder_client trove.common.single_tenant_remote.cinder_client_trove_admin + iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_neutron_client trove.common.single_tenant_remote.neutron_client_trove_admin + iniset $TROVE_GUESTAGENT_CONF DEFAULT remote_swift_client trove.common.single_tenant_remote.swift_client_trove_admin setup_trove_logging $TROVE_GUESTAGENT_CONF # To avoid 'Connection timed out' error of sudo command inside the guest agent |