Merge "SM : remove discovery feature from contrail provisioning"

Juniper · Feb 24, 2017 · 9769d97 · 9769d97
2 parents 1915cf5 + a640c91
commit 9769d97
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 45 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/collector/config.pp b/contrail/environment/modules/contrail/manifests/collector/config.pp
@@ -3,6 +3,7 @@
     $database_ip_list = $::contrail::params::database_ip_list,
     $database_ip_port = $::contrail::params::database_ip_port,
     $collector_ip_list = $::contrail::params::collector_ip_list,
+    $collector_ip_port_list = $::contrail::params::collector_ip_port_list,
     $analytics_data_ttl = $::contrail::params::analytics_data_ttl,
     $analytics_config_audit_ttl = $::contrail::params::analytics_config_audit_ttl,
     $analytics_statistics_ttl = $::contrail::params::analytics_statistics_ttl,
@@ -74,7 +75,6 @@
 
     contrail_analytics_api_config {
       'DEFAULTS/host_ip'          : value => $host_control_ip;
-      'DEFAULTS/collectors'       : ensure => 'absent';
       'DEFAULTS/cassandra_server_list': value => "$cassandra_server_list";
       'DEFAULTS/rest_api_port'    : value => $rest_api_port_to_use;
       'DEFAULTS/http_server_port' : value => '8090';
@@ -89,23 +89,20 @@
       'DEFAULTS/aaa_mode' : value => 'cloud-admin';
       'DEFAULTS/api_server' : value => $analytics_api_server_to_use;
       'DEFAULTS/zk_list'           : value => $zk_ip_list;
-      'DISCOVERY/disc_server_ip'   : value => $config_ip_to_use;
-      'DISCOVERY/disc_server_port' : value => '5998';
+      'DEFAULTS/collectors'        : value => $collector_ip_port_list;
       'REDIS/redis_query_port'     : value => '6379';
       'REDIS/redis_uve_list'       : value => $redis_server_list;
     } ->
 
     contrail_query_engine_config {
       'DEFAULT/hostip'          : value => $host_control_ip;
       'DEFAULT/cassandra_server_list'       : value => "$cassandra_server_list";
-      'DEFAULT/collectors'       : ensure => 'absent';
       'DEFAULT/log_local'        : value => '1';
       'DEFAULT/log_level'        : value => 'SYS_NOTICE';
       'DEFAULT/log_file'         : value => '/var/log/contrail/contrail-query-engine.log';
+      'DEFAULT/collectors'       : value => $collector_ip_port_list;
       'REDIS/port'               : value => '6379';
       'REDIS/server'             : value => '127.0.0.1';
-      'DISCOVERY/server'         : value => $config_ip_to_use;
-      'DISCOVERY/port'           : value => '5998';
     } ->
 
     contrail_collector_config {
@@ -124,7 +121,6 @@
       'DEFAULT/analytics_flow_ttl' : value => $analytics_flow_ttl;
       'DEFAULT/api_server_list'  : value => $api_server_list;
       'COLLECTOR/port'           : value => '8086';
-      'DISCOVERY/server'         : value => $config_ip_to_use;
       'REDIS/port'               : value => '6379';
       'REDIS/server'             : value => '127.0.0.1';
     } ->
@@ -138,14 +134,11 @@
       'DEFAULTS/fast_scan_frequency': value => $snmp_fast_scan_frequency;
       'DEFAULTS/http_server_port'   : value => '5920';
       'DEFAULTS/api_server_list'    : value => $api_server_list;
-      'DISCOVERY/disc_server_port' : value => '5998';
-      'DISCOVERY/disc_server_ip'   : value => $config_ip_to_use;
+      'DEFAULTS/collectors'         : value => $collector_ip_port_list;
     } ->
 
     contrail_analytics_nodemgr_config {
-      'DEFAULT/server' : value => $config_ip_to_use;
-      'DEFAULT/port'   : value => '5998';
-      'DISCOVERY/server': value => $config_ip_to_use;
+      'COLLECTOR/server_list': value => $collector_ip_port_list;
     } ->
 
     contrail_alarm_gen_config {
@@ -161,10 +154,9 @@
       'DEFAULTS/log_local'          : value => '1';
       'DEFAULTS/log_level'          : value => 'SYS_NOTICE';
       'DEFAULTS/log_file'           : value => '/var/log/contrail/contrail-alarm-gen.log';
-      'DEFAULTS/api_server_list'   : value => $api_server_list;
-      'DISCOVERY/disc_server_port' : value => '5998';
-      'DISCOVERY/disc_server_ip'   : value => $config_ip_to_use;
-      'REDIS/redis_uve_list'       : value => $redis_server_list;
+      'DEFAULTS/api_server_list'    : value => $api_server_list;
+      'DEFAULTS/collectors'         : value => $collector_ip_port_list;
+      'REDIS/redis_uve_list'        : value => $redis_server_list;
     } ->
 
     contrail_topology_config {
@@ -174,8 +166,7 @@
       'DEFAULTS/log_file'           : value => '/var/log/contrail/contrail-topology.log';
       'DEFAULTS/scan_frequency'     : value => $topology_scan_frequency;
       'DEFAULTS/api_server_list'    : value => $api_server_list;
-      'DISCOVERY/disc_server_ip'    : value => $config_ip_to_use;
-      'DISCOVERY/disc_server_port'  : value => '5998';
+      'DEFAULTS/collectors'         : value => $collector_ip_port_list;
     } ->
 
     contrail_alarm_gen_ini_config {

diff --git a/contrail/environment/modules/contrail/manifests/compute/config.pp b/contrail/environment/modules/contrail/manifests/compute/config.pp
@@ -2,6 +2,9 @@
   $host_control_ip = $::contrail::params::host_ip,
   $config_ip = $::contrail::params::config_ip_list[0],
   $openstack_ip = $::contrail::params::openstack_ip_list[0],
+  $collector_ip_port_list = $::contrail::params::collector_ip_port_list,
+  $control_ip_port_list   = $::contrail::params::control_ip_port_list,
+  $dns_ip_port_list       = $::contrail::params::dns_ip_port_list,
   $control_ip_list = $::contrail::params::control_ip_list,
   $compute_ip_list = $::contrail::params::compute_ip_list,
   $keystone_ip = $::contrail::params::keystone_ip,
@@ -283,7 +286,7 @@
   if $contrail_agent_mode == 'tsn' {
     Contrail_vrouter_agent_config['VIRTUAL-HOST-INTERFACE/compute_node_address'] ->
     contrail_vrouter_agent_config { 'DEFAULT/agent_mode' : value => "tsn"; } ->
-    Contrail_vrouter_nodemgr_config['DISCOVERY/server']
+    Contrail_vrouter_nodemgr_config['COLLECTOR/server_list']
   }
 
   notify {"vmware_physical_intf = ${vmware_physical_intf}":; } ->
@@ -343,8 +346,9 @@
     'DEFAULT/physical_interface_mac' : value => "$contrail_macaddr";
     'DEFAULT/physical_uio_driver' : value => "$uio_driver";
     'DEFAULT/xmpp_dns_auth_enable' : value => "$xmpp_dns_auth_enable";
-    'DISCOVERY/server' : value => "$discovery_ip";
-    'DISCOVERY/max_control_nodes' : value => "$number_control_nodes";
+    'DEFAULT/collectors'           : value => "$collector_ip_port_list";
+    'CONTROL-NODE/servers'         : value => "$control_ip_port_list";
+    'DNS/servers'                  : value => "$dns_ip_port_list";
     'HYPERVISOR/type' : value => "$hypervisor_type";
     'HYPERVISOR/vmware_physical_interface' : value => "$vmware_physical_intf";
     'NETWORKS/control_network_ip' : value => "$host_control_ip";
@@ -359,8 +363,7 @@
   } ->
 
   contrail_vrouter_nodemgr_config {
-    'DISCOVERY/server' : value => "$discovery_ip";
-    'DISCOVERY/port' : value => '5998';
+    'COLLECTOR/server_list': value => $collector_ip_port_list;
   } ->
   class {'::contrail::compute::add_vnc_config':
     host_control_ip => $host_control_ip,

diff --git a/contrail/environment/modules/contrail/manifests/config/config.pp b/contrail/environment/modules/contrail/manifests/config/config.pp
@@ -1,6 +1,7 @@
 class contrail::config::config (
   $host_control_ip = $::contrail::params::host_ip,
   $collector_ip = $::contrail::params::collector_ip_list[0],
+  $collector_ip_port_list = $::contrail::params::collector_ip_port_list,
   $database_ip_list = $::contrail::params::database_ip_list,
   $control_ip_list = $::contrail::params::control_ip_list,
   $openstack_ip = $::contrail::params::openstack_ip_list[0],
@@ -283,22 +284,20 @@
     'DEFAULTS/log_file'             : value => '/var/log/contrail/api.log';
     'DEFAULTS/log_local'            : value => '1';
     'DEFAULTS/log_level'            : value => 'SYS_NOTICE';
-    'DEFAULTS/disc_server_ip'       : value => "$config_ip";
-    'DEFAULTS/disc_server_port'     : value => '5998';
     'DEFAULTS/zk_server_ip'         : value => "$zk_ip_port_list";
     'DEFAULTS/rabbit_server'        : value => "$contrail_rabbit_servers";
     'DEFAULTS/rabbit_use_ssl'       : value => $rabbit_use_ssl;
     'DEFAULTS/kombu_ssl_ca_certs'   : value => $kombu_ssl_ca_certs;
-    'DEFAULTS/kombu_ssl_certfile'    : value => $kombu_ssl_certfile;
+    'DEFAULTS/kombu_ssl_certfile'   : value => $kombu_ssl_certfile;
     'DEFAULTS/kombu_ssl_keyfile'    : value => $kombu_ssl_keyfile;
+    'DEFAULTS/collectors'           : value => $collector_ip_port_list;
     'SECURITY/use_certs'            : value => "$use_certs";
     'SECURITY/keyfile'              : value => '/etc/contrail/ssl/private_keys/apiserver_key.pem';
     'SECURITY/certfile'             : value => '/etc/contrail/ssl/certs/apiserver.pem';
     'SECURITY/ca_certs'             : value => '/etc/contrail/ssl/certs/ca.pem';
   } ->
   contrail_config_nodemgr_config {
-    'DISCOVERY/server'     : value => "$config_ip";
-    'DISCOVERY/port'     : value => '5998';
+    'COLLECTOR/server_list': value => $collector_ip_port_list;
   } ->
   contrail_schema_config {
     'DEFAULTS/ifmap_server_ip'      : value => "$host_control_ip";
@@ -310,15 +309,14 @@
     'DEFAULTS/zk_server_ip'         : value => "$zk_ip_port_list";
     'DEFAULTS/log_file'             : value => '/var/log/contrail/schema.log';
     'DEFAULTS/cassandra_server_list': value => "$cassandra_server_list";
-    'DEFAULTS/disc_server_ip'       : value => "$config_ip";
-    'DEFAULTS/disc_server_port'     : value => '5998';
     'DEFAULTS/log_local'            : value => '1';
     'DEFAULTS/log_level'            : value => 'SYS_NOTICE';
     'DEFAULTS/rabbit_server'        : value => "$contrail_rabbit_servers";
     'DEFAULTS/rabbit_use_ssl'       : value => $rabbit_use_ssl;
     'DEFAULTS/kombu_ssl_ca_certs'   : value => $kombu_ssl_ca_certs;
     'DEFAULTS/kombu_ssl_certfile'   : value => $kombu_ssl_certfile;
     'DEFAULTS/kombu_ssl_keyfile'    : value => $kombu_ssl_keyfile;
+    'DEFAULTS/collectors'           : value => $collector_ip_port_list;
     'SECURITY/use_certs'            : value => "$use_certs";
     'SECURITY/keyfile'              : value => '/etc/contrail/ssl/private_keys/schema_xfer_key.pem';
     'SECURITY/certfile'             : value => '/etc/contrail/ssl/certs/schema_xfer.pem';
@@ -334,8 +332,6 @@
     'DEFAULTS/zk_server_ip'         : value => "$zk_ip_port_list";
     'DEFAULTS/log_file'             : value => '/var/log/contrail/svc-monitor.log';
     'DEFAULTS/cassandra_server_list': value => "$cassandra_server_list";
-    'DEFAULTS/disc_server_ip'       : value => "$config_ip";
-    'DEFAULTS/disc_server_port'     : value => '5998';
     'DEFAULTS/region_name'          : value => "$keystone_region_name";
     'DEFAULTS/log_local'            : value => '1';
     'DEFAULTS/log_level'            : value => 'SYS_NOTICE';
@@ -344,6 +340,7 @@
     'DEFAULTS/kombu_ssl_ca_certs'   : value => $kombu_ssl_ca_certs;
     'DEFAULTS/kombu_ssl_certfile'   : value => $kombu_ssl_certfile;
     'DEFAULTS/kombu_ssl_keyfile'    : value => $kombu_ssl_keyfile;
+    'DEFAULTS/collectors'           : value => $collector_ip_port_list;
     'SECURITY/use_certs'            : value => "$use_certs";
     'SECURITY/keyfile'              : value => '/etc/contrail/ssl/private_keys/svc_monitor_key.pem';
     'SECURITY/certfile'             : value => '/etc/contrail/ssl/certs/svc_monitor.pem';
@@ -358,14 +355,12 @@
     'DEFAULTS/kombu_ssl_certfile'   : value => $kombu_ssl_certfile;
     'DEFAULTS/kombu_ssl_keyfile'    : value => $kombu_ssl_keyfile;
     'DEFAULTS/api_server_ip'        : value => "$config_ip";
-    'DEFAULTS/disc_server_ip'       : value => "$config_ip";
-    'DEFAULTS/api_server_port'      : value => '8082';
     'DEFAULTS/zk_server_ip'         : value => "$zk_ip_port_list";
     'DEFAULTS/log_file'             : value => '/var/log/contrail/contrail-device-manager.log';
     'DEFAULTS/cassandra_server_list': value => "$cassandra_server_list";
-    'DEFAULTS/disc_server_port'     : value => '5998';
     'DEFAULTS/log_local'            : value => '1';
     'DEFAULTS/log_level'            : value => 'SYS_NOTICE';
+    'DEFAULTS/collectors'           : value => "$collector_ip_port_list";
   } ->
   contrail_discovery_config {
     'DEFAULTS/zk_server_ip'         : value => "$zk_ip_list";
@@ -381,6 +376,7 @@
     'DEFAULTS/hc_interval'          : value => "$hc_interval";
     'DEFAULTS/hc_max_miss'          : value => '3';
     'DEFAULTS/ttl_short'            : value => '1';
+    'DEFAULTS/collectors'           : value => $collector_ip_port_list;
     'DNS-SERVER/policy'             : value => 'fixed';
   } ->
   contrail_vnc_api_config {

diff --git a/contrail/environment/modules/contrail/manifests/config/database.pp b/contrail/environment/modules/contrail/manifests/config/database.pp
@@ -2,6 +2,7 @@
   $host_control_ip = $::contrail::params::host_ip,
   $config_ip = $::contrail::params::config_ip_to_use,
   $config_ip_list = $::contrail::params::config_ip_list,
+  $collector_ip_port_list = $::contrail::params::collector_ip_port_list,
   $internal_vip = $::contrail::params::internal_vip,
   $zookeeper_ip_list = $::contrail::params::config_ip_list,
   $database_initial_token = $::contrail::params::database_initial_token,
@@ -95,10 +96,9 @@
             zk_myid_file   => $zk_myid_file
             } ->
             contrail_database_nodemgr_config {
-              'DEFAULT/hostip': value => $host_control_ip;
-              'DEFAULT/minimum_diskGB' : value => $database_minimum_diskGB;
-              'DISCOVERY/server' : value => $config_ip;
-              'DISCOVERY/port' : value => '5998';
+              'DEFAULTS/hostip'         : value => $host_control_ip;
+              'DEFAULTS/minimum_diskGB' : value => $database_minimum_diskGB;
+              'COLLECTOR/server_list'   : value => $collector_ip_port_list;
             } ->
             file { '/etc/contrail/database_nodemgr_param' :
             ensure  => present,

diff --git a/contrail/environment/modules/contrail/manifests/control/config.pp b/contrail/environment/modules/contrail/manifests/control/config.pp
@@ -1,5 +1,6 @@
 class contrail::control::config (
     $host_control_ip = $::contrail::params::host_ip,
+    $collector_ip_port_list = $::contrail::params::collector_ip_port_list,
     $config_ip = $::contrail::params::config_ip_list[0],
     $internal_vip = $::contrail::params::internal_vip,
     $contrail_internal_vip = $::contrail::params::contrail_internal_vip,
@@ -41,7 +42,7 @@
       'DEFAULT/log_file'  : value => '/var/log/contrail/dns.log';
       'DEFAULT/log_level' : value => 'SYS_NOTICE';
       'DEFAULT/log_local' : value => '1';
-      'DISCOVERY/server'  : value => $config_ip_to_use;
+      'DEFAULT/collectors': value => $collector_ip_port_list;
       'IFMAP/user'        : value => "$host_control_ip.dns";
       'IFMAP/password'    : value => "$host_control_ip.dns";
       'IFMAP/certs_store' : value => "$certs_store";
@@ -52,14 +53,13 @@
       'DEFAULT/log_file'  : value => '/var/log/contrail/contrail-control.log';
       'DEFAULT/log_level' : value => 'SYS_NOTICE';
       'DEFAULT/log_local' : value => '1';
-      'DISCOVERY/server'  : value => $config_ip_to_use;
+      'DEFAULT/collectors': value => $collector_ip_port_list;
       'IFMAP/user'        : value => "$host_control_ip";
       'IFMAP/password'    : value => "$host_control_ip";
       'IFMAP/certs_store' : value => "$certs_store";
     } ->
     contrail_control_nodemgr_config {
-      'DISCOVERY/server'  : value => $config_ip_to_use;
-      'DISCOVERY/port'    : value => '5998';
+      'COLLECTOR/server_list'  : value => $collector_ip_port_list;
     } ->
     Class['::contrail::xmpp_cert_files']
 }
diff --git a/contrail/environment/modules/contrail/manifests/database/config.pp b/contrail/environment/modules/contrail/manifests/database/config.pp
@@ -1,6 +1,7 @@
 class contrail::database::config (
   $host_control_ip = $::contrail::params::host_ip,
   $config_ip = $::contrail::params::config_ip_to_use,
+  $collector_ip_port_list = $::contrail::params::collector_ip_port_list,
   $database_ip_list = $::contrail::params::database_ip_list,
   $internal_vip = $::contrail::params::internal_vip,
   $zookeeper_ip_list = $::contrail::params::database_ip_list,
@@ -144,8 +145,7 @@
     contrail_database_nodemgr_config {
       'DEFAULTS/hostip': value => $host_control_ip;
       'DEFAULTS/minimum_diskGB' : value => $database_minimum_diskGB;
-      'DISCOVERY/server' : value => $config_ip;
-      'DISCOVERY/port' : value => '5998';
+      'COLLECTOR/server_list': value => $collector_ip_port_list;
     } ->
     file { '/etc/contrail/database_nodemgr_param' :
         ensure  => present,

diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp
@@ -1051,6 +1051,10 @@
       }
     }
 
+    $collector_ip_port_list = join(suffix($collector_ip_list, ":8086"), " ")
+    $control_ip_port_list   = join(suffix($control_ip_list, ":5269")," ")
+    $dns_ip_port_list       = join(suffix($control_ip_list, ":53")," ")
+
      if ($host_ip == $openstack_ip_list[0]) {
        $os_sync_db = true
      } else {