Fix config nodemgr configuration
PROD-21172
Change-Id: Ic77175b6f8027cd1ab4fac809bb6535421bea4e1
diff --git a/README.rst b/README.rst
index d7350c8..e285e13 100644
--- a/README.rst
+++ b/README.rst
@@ -826,8 +826,10 @@
sync_on_demand: false
...
-Cassandra listen interface
---------------------------
+Cassandra listen configuration
+------------------------------
+
+Interface example:
.. code-block:: yaml
@@ -839,6 +841,21 @@
rpc_port: 9160
....
+For running config and analytics db clusters on same hosts, you will need to
+change ports not to collide. The host is required.
+
+ database:
+ ....
+ bind:
+ host: 127.0.0.1
+ port: 9042
+ rpc_port: 9160
+ # for containers we need to move configdb to neighbouring ports
+ port_configdb: 9041
+ rpc_port_configdb: 9161
+ ....
+
+
OpenContrail WebUI version >= 3.1.1
-----------------------------------
For OpenContrail version >= 3.1.1 and Cassandra >= 2.1 we should override WebUI's cassandra port from 9160 to 9042.
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index b148571..dedcc1f 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -136,6 +136,10 @@
host: ${_param:cluster_local_address}
port: 9042
rpc_port: 9160
+ # for containers we need to move configdb to neighbouring ports
+ port_configdb: 9041
+ rpc_port_configdb: 9161
+
members:
- host: ${_param:cluster_node01_address}
id: 1
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index 52e3e82..c3bb5d1 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -103,6 +103,9 @@
host: ${_param:cluster_local_address}
port: 9042
rpc_port: 9160
+ # for containers we need to move configdb to neighbouring ports
+ port_configdb: 9041
+ rpc_port_configdb: 9161
members:
- host: ${_param:cluster_node01_address}
id: 1
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 82313ab..f17d610 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -122,6 +122,9 @@
host: ${_param:single_address}
port: 9042
rpc_port: 9160
+ # for containers we need to move configdb to neighbouring ports
+ port_configdb: 9041
+ rpc_port_configdb: 9161
members:
- host: ${_param:single_address}
id: 1
diff --git a/opencontrail/files/4.0/cassandra.yaml b/opencontrail/files/4.0/cassandra.yaml
index 5aea775..5db8dce 100644
--- a/opencontrail/files/4.0/cassandra.yaml
+++ b/opencontrail/files/4.0/cassandra.yaml
@@ -402,7 +402,7 @@
start_native_transport: true
# port for the CQL native transport to listen for clients on
# For security reasons, you should not expose this port to the internet. Firewall it if needed.
-native_transport_port: 9041
+native_transport_port: {{ database.bind.get('port_configdb', database.bind.get('port', 9042)) }}
# The maximum threads for handling requests when the native transport is used.
# This is similar to rpc_max_threads though the default differs slightly (and
# there is no native_transport_min_threads, idle threads will always be stopped
@@ -448,8 +448,7 @@
rpc_address: {{ database.bind.host }}
{% endif %}
# port for Thrift to listen for clients on
-rpc_port: 9161
-#rpc_port: {{ database.bind.rpc_port }}
+rpc_port: {{ database.bind.get('rpc_port_configdb', database.bind.get('rpc_port', 9160)) }}
# RPC address to broadcast to drivers and other Cassandra nodes. This cannot
# be set to 0.0.0.0. If left blank, this will be set to the value of
diff --git a/opencontrail/files/4.0/cassandra_analytics.yaml b/opencontrail/files/4.0/cassandra_analytics.yaml
index 208096d..6e3f74b 100644
--- a/opencontrail/files/4.0/cassandra_analytics.yaml
+++ b/opencontrail/files/4.0/cassandra_analytics.yaml
@@ -402,7 +402,7 @@
start_native_transport: true
# port for the CQL native transport to listen for clients on
# For security reasons, you should not expose this port to the internet. Firewall it if needed.
-native_transport_port: 9042
+native_transport_port: {{ database.bind.get('port', 9042) }}
# The maximum threads for handling requests when the native transport is used.
# This is similar to rpc_max_threads though the default differs slightly (and
# there is no native_transport_min_threads, idle threads will always be stopped
@@ -448,8 +448,7 @@
rpc_address: {{ database.bind.host }}
{% endif %}
# port for Thrift to listen for clients on
-rpc_port: 9160
-# rpc_port: {{ database.bind.rpc_port }}
+rpc_port: {{ database.bind.get('rpc_port', 9160) }}
# RPC address to broadcast to drivers and other Cassandra nodes. This cannot
# be set to 0.0.0.0. If left blank, this will be set to the value of
diff --git a/opencontrail/files/4.0/contrail-config-nodemgr.conf b/opencontrail/files/4.0/contrail-config-nodemgr.conf
index f7f8034..d9964ca 100644
--- a/opencontrail/files/4.0/contrail-config-nodemgr.conf
+++ b/opencontrail/files/4.0/contrail-config-nodemgr.conf
@@ -1,7 +1,9 @@
-{%- from "opencontrail/map.jinja" import config with context %}
-{%- if pillar.opencontrail.database is defined and config.version >= 4.0 %}
+{%- from "opencontrail/map.jinja" import config,database with context %}
+{%- if database is defined and config.version >= 4.0 %}
[DEFAULTS]
-minimum_diskGB={{ pillar.opencontrail.database.get('minimum_disk', 80) }}
+minimum_diskGB={{ database.get('minimum_disk', 80) }}
+hostip={{ database.bind.get('host', '127.0.0.1') }}
+db_port={{ database.bind.get('port_configdb', database.bind.get('port', 9042)) }}
{%- endif %}
[COLLECTOR]
diff --git a/opencontrail/files/4.0/contrail-database-nodemgr.conf b/opencontrail/files/4.0/contrail-database-nodemgr.conf
index 5d85520..04ae2e3 100644
--- a/opencontrail/files/4.0/contrail-database-nodemgr.conf
+++ b/opencontrail/files/4.0/contrail-database-nodemgr.conf
@@ -7,6 +7,8 @@
{%- else %}
contrail_databases=Analytics
{%- endif %}
+hostip={{ database.bind.get('host', '127.0.0.1') }}
+db_port={{ database.bind.get('port', 9042) }}
[COLLECTOR]
server_list={% for member in database.analytics.members %}{{ member.host }}:8086 {% endfor %}