Update setting files

snf-cyclades-app/synnefo/app_settings/default/api.py

@@ -21,8 +21,8 @@ POLL_LIMIT = 3600
 # Network Configuration
 #
 
-# Synnefo assigns this link id to NICs connected on the public network.
-# An IP pool should be associated with this link by the Ganeti administrator.
+# Name of the public network in Ganeti. An IP pool should be associated with
+# this network by the Ganeti administrator.
 GANETI_PUBLIC_NETWORK = 'snf_public'
 # This link id is assigned to NICs that should be isolated from anything else
 # (e.g., right before the NIC gets deleted).

snf-cyclades-app/synnefo/app_settings/default/queues.py

@@ -3,14 +3,10 @@
 # Queues, exchanges and bindings for AMQP
 ###########################################
 
-# Rabbit work queue endpoint
-RABBIT_HOST = "10.0.0.1:5672"
-RABBIT_USERNAME = "rabbit-username"
-RABBIT_PASSWORD = "rabbit-password"
-RABBIT_VHOST = "/"
-AMQP_HOSTS=["amqp://username:password@host:port"]
-# AMQP Backend Client. One of: 'puka', 'haigha'
-AMQP_BACKEND='puka'
+# List of RabbitMQ endpoints
+AMQP_HOSTS = ["amqp://username:password@host:port"]
+# AMQP Backend Client. Currently only puka
+AMQP_BACKEND = 'puka'
 
 EXCHANGE_GANETI = "ganeti"  # Messages from Ganeti
 EXCHANGE_CRON = "cron"      # Messages from periodically triggered tasks

snf-cyclades-gtools/synnefo/ganeti/settings.py

 # snf-cyclades-gtools settings
 
-RABBIT_HOST = "127.0.0.1:5672"
-RABBIT_USERNAME = "rabbit-username"
-RABBIT_PASSWORD = "rabbit-password"
-RABBIT_VHOST = "/"
-AMQP_HOSTS=["amqp://username:password@host:port"]
 BACKEND_PREFIX_ID = "snf-"
 EXCHANGE_GANETI = "ganeti"
 PUBLIC_IPV6_PREFIX = "2001:db8::/64"
+
+# List of RabbitMQ endpoints
+AMQP_HOSTS = ["amqp://username:password@host:port"]
+# AMQP Backend Client. Currently only puka
+AMQP_BACKEND = 'puka'