From 636e0053bd62f95ae427c2d41db5cc1da2edf3cd Mon Sep 17 00:00:00 2001 From: jiansong Date: Mon, 6 Aug 2018 00:08:31 -0700 Subject: [PATCH] Remove nova conf for guestagent It seems that the current guestagent only needs to communicate through amqp, and does not need to interact with nova, so the related nova configuration can be removed from the guestagent, which can reduce some invalid configuration. Similarly, we removed the related configuration of condutor and guestagent in devstack plugin. Change-Id: I3f0b3b445c053351c1f3e966d77ea228df0e94a7 --- devstack/plugin.sh | 6 ------ doc/source/admin/basics.rst | 3 --- doc/source/install/common_configure.txt | 3 --- 3 files changed, 12 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f245f32c78..0b3b215895 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -272,9 +272,6 @@ function configure_trove { iniset $TROVE_CONDUCTOR_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID iniset $TROVE_CONDUCTOR_CONF database connection `database_connection_url trove` - iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_user radmin - iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_tenant_name trove - iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS iniset $TROVE_CONDUCTOR_CONF DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT iniset $TROVE_CONDUCTOR_CONF DEFAULT control_exchange trove @@ -291,9 +288,6 @@ function configure_trove { iniset $TROVE_GUESTAGENT_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID iniset $TROVE_GUESTAGENT_CONF oslo_messaging_rabbit rabbit_hosts $TROVE_HOST_GATEWAY - iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_user radmin - iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_tenant_name trove - iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS iniset $TROVE_GUESTAGENT_CONF DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT iniset $TROVE_GUESTAGENT_CONF DEFAULT control_exchange trove iniset $TROVE_GUESTAGENT_CONF DEFAULT ignore_users os_admin diff --git a/doc/source/admin/basics.rst b/doc/source/admin/basics.rst index 90a71108fe..70f57f50e4 100644 --- a/doc/source/admin/basics.rst +++ b/doc/source/admin/basics.rst @@ -54,9 +54,6 @@ data store version. rabbit_host = controller rabbit_password = RABBIT_PASS - nova_proxy_admin_user = admin - nova_proxy_admin_pass = ADMIN_PASS - nova_proxy_admin_tenant_name = service trove_auth_url = http://controller:35357/v2.0 This example assumes you have created a MySQL 5.5 image called diff --git a/doc/source/install/common_configure.txt b/doc/source/install/common_configure.txt index 77aa923497..0aa5ffbcff 100644 --- a/doc/source/install/common_configure.txt +++ b/doc/source/install/common_configure.txt @@ -96,9 +96,6 @@ rabbit_host = controller rabbit_password = RABBIT_PASS - nova_proxy_admin_user = admin - nova_proxy_admin_pass = ADMIN_PASS - nova_proxy_admin_tenant_name = service trove_auth_url = http://controller/identity_admin/v2.0 7. Populate the trove database you created earlier in this procedure: