Browse code

Merge "Fix trove guest confing to ignore user os_admin"

Jenkins authored on 2014/07/31 09:55:49
Showing 1 changed files
... ...
@@ -180,6 +180,7 @@ function configure_trove {
180 180
     iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS
181 181
     iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT
182 182
     iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT control_exchange trove
183
+    iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT ignore_users os_admin
183 184
     iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT log_dir /tmp/
184 185
     iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT log_file trove-guestagent.log
185 186
     setup_trove_logging $TROVE_CONF_DIR/trove-guestagent.conf