Merge "Add rabbit server and port to schema transformer config file" …

…into R2.22-dev
Juniper · Sep 8, 2015 · df4c5f6 · df4c5f6
2 parents 01d8a29 + 5be6d4c
commit df4c5f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/contrail_provisioning/config/common.py b/contrail_provisioning/config/common.py
@@ -170,6 +170,8 @@ def fixup_schema_transformer_config_file(self):
                          '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list),
                          '__contrail_disc_server_ip__': self._args.internal_vip or self.cfgm_ip,
                          '__contrail_disc_server_port__': '5998',
+                         '__rabbit_server_ip__': self.rabbit_host,
+                         '__rabbit_server_port__': self.rabbit_port,
                         }
         self._template_substitute_write(contrail_schema_transformer_conf.template,
                                         template_vals, self._temp_dir_name + '/contrail-schema.conf')

diff --git a/contrail_provisioning/config/templates/contrail_schema_transformer_conf.py b/contrail_provisioning/config/templates/contrail_schema_transformer_conf.py
@@ -13,6 +13,8 @@
 cassandra_server_list=$__contrail_cassandra_server_list__
 disc_server_ip=$__contrail_disc_server_ip__
 disc_server_port=$__contrail_disc_server_port__
+rabbit_server=$__rabbit_server_ip__
+rabbit_port=$__rabbit_server_port__
 log_local=1
 log_level=SYS_NOTICE