Browse code

Merge "Remove unneeded guest conf values"

Jenkins authored on 2014/02/05 20:46:47
Showing 1 changed files
... ...
@@ -148,8 +148,6 @@ function configure_trove() {
148 148
     iniset $TROVE_CONF_DIR/trove.conf DEFAULT add_addresses True
149 149
 
150 150
     iniset $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample DEFAULT rabbit_password $RABBIT_PASSWORD
151
-    iniset $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample DEFAULT sql_connection `database_connection_url trove`
152
-    iniset $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample DEFAULT control_exchange trove
153 151
     sed -i "s/localhost/$NETWORK_GATEWAY/g" $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample
154 152
 
155 153
     setup_trove_logging $TROVE_CONF_DIR/trove.conf