diff --git a/src/analytics/contrail-broadview/contrail-broadview.conf b/src/analytics/contrail-broadview/contrail-broadview.conf index fa800b78a26..b4f08d763bd 100644 --- a/src/analytics/contrail-broadview/contrail-broadview.conf +++ b/src/analytics/contrail-broadview/contrail-broadview.conf @@ -15,6 +15,6 @@ log_file=/var/log/contrail/contrail-broadview.log [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/analytics/contrail-broadview/contrail_broadview/config.py b/src/analytics/contrail-broadview/contrail_broadview/config.py index db05a0d2839..0a3ec47f866 100644 --- a/src/analytics/contrail-broadview/contrail_broadview/config.py +++ b/src/analytics/contrail-broadview/contrail_broadview/config.py @@ -76,9 +76,9 @@ def parse(self): 'device_file' : '/etc/contrail/bv_devices.conf', } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -136,11 +136,11 @@ def parse(self): help="ip:port of zookeeper server") parser.add_argument("--sandesh_send_rate_limit", type=int, help="Sandesh send rate limit in messages/sec.") - parser.add_argument("--keyfile", + parser.add_argument("--sandesh_keyfile", help="Sandesh ssl private key") - parser.add_argument("--certfile", + parser.add_argument("--sandesh_certfile", help="Sandesh ssl certificate") - parser.add_argument("--ca_cert", + parser.add_argument("--sandesh_ca_cert", help="Sandesh CA ssl certificate") parser.add_argument("--sandesh_ssl_enable", action="store_true", help="Enable ssl for sandesh connection") @@ -216,8 +216,8 @@ def device_file(self): return self._args.device_file def sandesh_config(self): - return SandeshConfig(self._args.keyfile, - self._args.certfile, - self._args.ca_cert, + return SandeshConfig(self._args.sandesh_keyfile, + self._args.sandesh_certfile, + self._args.sandesh_ca_cert, self._args.sandesh_ssl_enable, self._args.introspect_ssl_enable) diff --git a/src/analytics/contrail-collector.conf b/src/analytics/contrail-collector.conf index 7d637889019..59ccfc1b1aa 100644 --- a/src/analytics/contrail-collector.conf +++ b/src/analytics/contrail-collector.conf @@ -123,6 +123,6 @@ sandesh_send_rate_limit=100 [SANDESH] # sandesh_ssl_enable=false # introspect_ssl_enable=false -# keyfile=/etc/contrail/ssl/private/server-privkey.pem -# certfile=/etc/contrail/ssl/certs/server.pem -# ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +# sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +# sandesh_certfile=/etc/contrail/ssl/certs/server.pem +# sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/analytics/contrail-snmp-collector/contrail-snmp-collector.conf b/src/analytics/contrail-snmp-collector/contrail-snmp-collector.conf index 65b3b807777..9fb72dd718d 100644 --- a/src/analytics/contrail-snmp-collector/contrail-snmp-collector.conf +++ b/src/analytics/contrail-snmp-collector/contrail-snmp-collector.conf @@ -31,6 +31,6 @@ log_file=/var/log/contrail/contrail-snmp-collector.log [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/analytics/contrail-snmp-collector/contrail_snmp_collector/snmpcfg.py b/src/analytics/contrail-snmp-collector/contrail_snmp_collector/snmpcfg.py index b2ba8f682ae..02d80140794 100644 --- a/src/analytics/contrail-snmp-collector/contrail_snmp_collector/snmpcfg.py +++ b/src/analytics/contrail-snmp-collector/contrail_snmp_collector/snmpcfg.py @@ -106,9 +106,9 @@ def parse(self): 'disc_server_port' : 5998, } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -185,11 +185,11 @@ def parse(self): help="Discovery Server IP address") parser.add_argument("--disc_server_port", type=int, help="Discovery Server port") - parser.add_argument("--keyfile", + parser.add_argument("--sandesh_keyfile", help="Sandesh ssl private key") - parser.add_argument("--certfile", + parser.add_argument("--sandesh_certfile", help="Sandesh ssl certificate") - parser.add_argument("--ca_cert", + parser.add_argument("--sandesh_ca_cert", help="Sandesh CA ssl certificate") parser.add_argument("--sandesh_ssl_enable", action="store_true", help="Enable ssl for sandesh connection") @@ -292,8 +292,8 @@ def sandesh_send_rate_limit(self): return self._args.sandesh_send_rate_limit def sandesh_config(self): - return SandeshConfig(self._args.keyfile, - self._args.certfile, - self._args.ca_cert, + return SandeshConfig(self._args.sandesh_keyfile, + self._args.sandesh_certfile, + self._args.sandesh_ca_cert, self._args.sandesh_ssl_enable, self._args.introspect_ssl_enable) diff --git a/src/analytics/contrail-topology/contrail-topology.conf b/src/analytics/contrail-topology/contrail-topology.conf index 587b7bed1d9..0a64a28c4d9 100644 --- a/src/analytics/contrail-topology/contrail-topology.conf +++ b/src/analytics/contrail-topology/contrail-topology.conf @@ -15,6 +15,6 @@ log_file=/var/log/contrail/contrail-topology.log [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/analytics/contrail-topology/contrail_topology/config.py b/src/analytics/contrail-topology/contrail_topology/config.py index 44001b43f71..51d987d4d69 100644 --- a/src/analytics/contrail-topology/contrail_topology/config.py +++ b/src/analytics/contrail-topology/contrail_topology/config.py @@ -96,9 +96,9 @@ def parse(self): 'admin_tenant_name': 'default-domain' } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -178,11 +178,11 @@ def parse(self): help="Password of keystone admin user") parser.add_argument("--admin_tenant_name", help="Tenant name for keystone admin user") - parser.add_argument("--keyfile", + parser.add_argument("--sandesh_keyfile", help="Sandesh ssl private key") - parser.add_argument("--certfile", + parser.add_argument("--sandesh_certfile", help="Sandesh ssl certificate") - parser.add_argument("--ca_cert", + parser.add_argument("--sandesh_ca_cert", help="Sandesh CA ssl certificate") parser.add_argument("--sandesh_ssl_enable", action="store_true", help="Enable ssl for sandesh connection") @@ -256,9 +256,9 @@ def sandesh_send_rate_limit(self): return self._args.sandesh_send_rate_limit def sandesh_config(self): - return SandeshConfig(self._args.keyfile, - self._args.certfile, - self._args.ca_cert, + return SandeshConfig(self._args.sandesh_keyfile, + self._args.sandesh_certfile, + self._args.sandesh_ca_cert, self._args.sandesh_ssl_enable, self._args.introspect_ssl_enable) diff --git a/src/analytics/options.cc b/src/analytics/options.cc index 70490a1aac3..2b17d0ec4ff 100644 --- a/src/analytics/options.cc +++ b/src/analytics/options.cc @@ -339,13 +339,13 @@ void Options::Initialize(EventManager &evm, ("KEYSTONE.cafile", opt::value()->default_value( "/etc/contrail/ks-ca"), "Keystone CA chain") - ("SANDESH.keyfile", opt::value()->default_value( + ("SANDESH.sandesh_keyfile", opt::value()->default_value( "/etc/contrail/ssl/private/server-privkey.pem"), "Sandesh ssl private key") - ("SANDESH.certfile", opt::value()->default_value( + ("SANDESH.sandesh_certfile", opt::value()->default_value( "/etc/contrail/ssl/certs/server.pem"), "Sandesh ssl certificate") - ("SANDESH.ca_cert", opt::value()->default_value( + ("SANDESH.sandesh_ca_cert", opt::value()->default_value( "/etc/contrail/ssl/certs/ca-cert.pem"), "Sandesh CA ssl certificate") ("SANDESH.sandesh_ssl_enable", @@ -630,11 +630,11 @@ void Options::Process(int argc, char *argv[], GetOptValue(var_map, ks_ca_, "KEYSTONE.cafile"); GetOptValue(var_map, sandesh_config_.keyfile, - "SANDESH.keyfile"); + "SANDESH.sandesh_keyfile"); GetOptValue(var_map, sandesh_config_.certfile, - "SANDESH.certfile"); + "SANDESH.sandesh_certfile"); GetOptValue(var_map, sandesh_config_.ca_cert, - "SANDESH.ca_cert"); + "SANDESH.sandesh_ca_cert"); GetOptValue(var_map, sandesh_config_.sandesh_ssl_enable, "SANDESH.sandesh_ssl_enable"); GetOptValue(var_map, sandesh_config_.introspect_ssl_enable, diff --git a/src/config/api-server/contrail-api.conf b/src/config/api-server/contrail-api.conf index 32c0d1081ab..0114316cdfb 100644 --- a/src/config/api-server/contrail-api.conf +++ b/src/config/api-server/contrail-api.conf @@ -36,6 +36,6 @@ ifmap_credentials = control:secret [SANDESH] #sandesh_ssl_enable=false #introspect_ssl_enable=false -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/config/api-server/utils.py b/src/config/api-server/utils.py index 8b146085527..c9c3d240099 100644 --- a/src/config/api-server/utils.py +++ b/src/config/api-server/utils.py @@ -144,9 +144,9 @@ def parse_args(args_str): } # sandesh options sandeshopts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -383,8 +383,8 @@ def parse_args(args_str): args_obj.rdbms_server_list.split() if type(args_obj.collectors) is str: args_obj.collectors = args_obj.collectors.split() - args_obj.sandesh_config = SandeshConfig(args_obj.keyfile, - args_obj.certfile, args_obj.ca_cert, args_obj.sandesh_ssl_enable, + args_obj.sandesh_config = SandeshConfig(args_obj.sandesh_keyfile, + args_obj.sandesh_certfile, args_obj.sandesh_ca_cert, args_obj.sandesh_ssl_enable, args_obj.introspect_ssl_enable) args_obj.conf_file = saved_conf_file diff --git a/src/config/device-manager/contrail-device-manager.conf b/src/config/device-manager/contrail-device-manager.conf index c54e9d012b0..bed89afb84b 100644 --- a/src/config/device-manager/contrail-device-manager.conf +++ b/src/config/device-manager/contrail-device-manager.conf @@ -8,6 +8,6 @@ disc_server_port = 5998 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/config/device-manager/device_manager/device_manager.py b/src/config/device-manager/device_manager/device_manager.py index df837626256..d30dd40037b 100644 --- a/src/config/device-manager/device_manager/device_manager.py +++ b/src/config/device-manager/device_manager/device_manager.py @@ -382,9 +382,9 @@ def parse_args(args_str): 'cassandra_password': None } sandeshopts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -494,8 +494,8 @@ def parse_args(args_str): args.cassandra_server_list = args.cassandra_server_list.split() if type(args.collectors) is str: args.collectors = args.collectors.split() - args.sandesh_config = SandeshConfig(args.keyfile, - args.certfile, args.ca_cert, + args.sandesh_config = SandeshConfig(args.sandesh_keyfile, + args.sandesh_certfile, args.sandesh_ca_cert, args.sandesh_ssl_enable, args.introspect_ssl_enable) args.conf_file = saved_conf_file diff --git a/src/config/schema-transformer/contrail-schema.conf b/src/config/schema-transformer/contrail-schema.conf index d9fde1ab623..1007d28844e 100644 --- a/src/config/schema-transformer/contrail-schema.conf +++ b/src/config/schema-transformer/contrail-schema.conf @@ -8,6 +8,6 @@ disc_server_port = 5998 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/config/schema-transformer/to_bgp.py b/src/config/schema-transformer/to_bgp.py index b821768382a..2517813f129 100644 --- a/src/config/schema-transformer/to_bgp.py +++ b/src/config/schema-transformer/to_bgp.py @@ -422,9 +422,9 @@ def parse_args(args_str): 'cassandra_password': None, } sandeshopts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -547,8 +547,8 @@ def _bool(s): args.cassandra_server_list = args.cassandra_server_list.split() if type(args.collectors) is str: args.collectors = args.collectors.split() - args.sandesh_config = SandeshConfig(args.keyfile, - args.certfile, args.ca_cert, + args.sandesh_config = SandeshConfig(args.sandesh_keyfile, + args.sandesh_certfile, args.sandesh_ca_cert, args.sandesh_ssl_enable, args.introspect_ssl_enable) return args diff --git a/src/config/svc-monitor/contrail-svc-monitor.conf b/src/config/svc-monitor/contrail-svc-monitor.conf index 1e3dfbd71f7..5330e4a4f0d 100644 --- a/src/config/svc-monitor/contrail-svc-monitor.conf +++ b/src/config/svc-monitor/contrail-svc-monitor.conf @@ -39,6 +39,6 @@ cassandra_server_list=127.0.0.1:9160 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/config/svc-monitor/svc_monitor/svc_monitor.py b/src/config/svc-monitor/svc_monitor/svc_monitor.py index e3c0e395187..b311425c129 100644 --- a/src/config/svc-monitor/svc_monitor/svc_monitor.py +++ b/src/config/svc-monitor/svc_monitor/svc_monitor.py @@ -747,9 +747,9 @@ def parse_args(args_str): 'cassandra_password': None, } sandeshopts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -867,8 +867,8 @@ def parse_args(args_str): if args.netns_availability_zone and \ args.netns_availability_zone.lower() == 'none': args.netns_availability_zone = None - args.sandesh_config = SandeshConfig(args.keyfile, - args.certfile, args.ca_cert, + args.sandesh_config = SandeshConfig(args.sandesh_keyfile, + args.sandesh_certfile, args.sandesh_ca_cert, args.sandesh_ssl_enable, args.introspect_ssl_enable) return args diff --git a/src/container/kube-manager/contrail-kubernetes.conf b/src/container/kube-manager/contrail-kubernetes.conf index 709266b8178..ab9da96cb01 100644 --- a/src/container/kube-manager/contrail-kubernetes.conf +++ b/src/container/kube-manager/contrail-kubernetes.conf @@ -24,6 +24,6 @@ log_file=/var/log/contrail/contrail-kube-manager.log [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/container/kube-manager/kube_manager/common/args.py b/src/container/kube-manager/kube_manager/common/args.py index 599450222ed..4bebf421f78 100644 --- a/src/container/kube-manager/kube_manager/common/args.py +++ b/src/container/kube-manager/kube_manager/common/args.py @@ -72,9 +72,9 @@ def parse_args(): } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -108,7 +108,7 @@ def parse_args(): args.pod_subnets = args.pod_subnets.split() if type(args.service_subnets) is str: args.service_subnets = args.service_subnets.split() - args.sandesh_config = SandeshConfig(args.keyfile, - args.certfile, args.ca_cert, + args.sandesh_config = SandeshConfig(args.sandesh_keyfile, + args.sandesh_certfile, args.sandesh_ca_cert, args.sandesh_ssl_enable, args.introspect_ssl_enable) return args diff --git a/src/container/mesos-manager/contrail-mesos.conf b/src/container/mesos-manager/contrail-mesos.conf index 220f9315ba1..d7312f8296b 100644 --- a/src/container/mesos-manager/contrail-mesos.conf +++ b/src/container/mesos-manager/contrail-mesos.conf @@ -23,6 +23,6 @@ log_file=/var/log/contrail/contrail-mesos-manager.log [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/container/mesos-manager/mesos_manager/common/args.py b/src/container/mesos-manager/mesos_manager/common/args.py index 82c7a1c679f..48230f0f891 100644 --- a/src/container/mesos-manager/mesos_manager/common/args.py +++ b/src/container/mesos-manager/mesos_manager/common/args.py @@ -54,9 +54,9 @@ def parse_args(): } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -92,7 +92,7 @@ def parse_args(): args.pod_subnets = args.pod_subnets.split() if type(args.service_subnets) is str: args.service_subnets = args.service_subnets.split() - args.sandesh_config = SandeshConfig(args.keyfile, - args.certfile, args.ca_cert, + args.sandesh_config = SandeshConfig(args.sandesh_keyfile, + args.sandesh_certfile, args.sandesh_ca_cert, args.sandesh_ssl_enable, args.introspect_ssl_enable) return args diff --git a/src/control-node/contrail-control.conf b/src/control-node/contrail-control.conf index d4ebf6f29d1..eb08241fd49 100644 --- a/src/control-node/contrail-control.conf +++ b/src/control-node/contrail-control.conf @@ -60,6 +60,6 @@ sandesh_send_rate_limit=100 [SANDESH] # sandesh_ssl_enable=false # introspect_ssl_enable=false -# keyfile=/etc/contrail/ssl/private/server-privkey.pem -# certfile=/etc/contrail/ssl/certs/server.pem -# ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +# sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +# sandesh_certfile=/etc/contrail/ssl/certs/server.pem +# sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/control-node/options.cc b/src/control-node/options.cc index 7e89dcd64df..d8ddd1646c0 100644 --- a/src/control-node/options.cc +++ b/src/control-node/options.cc @@ -218,13 +218,13 @@ void Options::Initialize(EventManager &evm, opt::value()->default_value(""), "CA Certificate file for SSL RabbitMQ connection") - ("SANDESH.keyfile", opt::value()->default_value( + ("SANDESH.sandesh_keyfile", opt::value()->default_value( "/etc/contrail/ssl/private/server-privkey.pem"), "Sandesh ssl private key") - ("SANDESH.certfile", opt::value()->default_value( + ("SANDESH.sandesh_certfile", opt::value()->default_value( "/etc/contrail/ssl/certs/server.pem"), "Sandesh ssl certificate") - ("SANDESH.ca_cert", opt::value()->default_value( + ("SANDESH.sandesh_ca_cert", opt::value()->default_value( "/etc/contrail/ssl/certs/ca-cert.pem"), "Sandesh CA ssl certificate") ("SANDESH.sandesh_ssl_enable", @@ -422,11 +422,11 @@ bool Options::Process(int argc, char *argv[], "IFMAP.rabbitmq_ssl_ca_certs"); GetOptValue(var_map, sandesh_config_.keyfile, - "SANDESH.keyfile"); + "SANDESH.sandesh_keyfile"); GetOptValue(var_map, sandesh_config_.certfile, - "SANDESH.certfile"); + "SANDESH.sandesh_certfile"); GetOptValue(var_map, sandesh_config_.ca_cert, - "SANDESH.ca_cert"); + "SANDESH.sandesh_ca_cert"); GetOptValue(var_map, sandesh_config_.sandesh_ssl_enable, "SANDESH.sandesh_ssl_enable"); GetOptValue(var_map, sandesh_config_.introspect_ssl_enable, diff --git a/src/dns/cmn/dns_options.cc b/src/dns/cmn/dns_options.cc index 4725acc50be..1314dd641e4 100644 --- a/src/dns/cmn/dns_options.cc +++ b/src/dns/cmn/dns_options.cc @@ -222,13 +222,13 @@ void Options::Initialize(EventManager &evm, opt::value()->default_value( "/etc/contrail/ssl/certs/ca-cert.pem"), "XMPP CA ssl certificate") - ("SANDESH.keyfile", opt::value()->default_value( + ("SANDESH.sandesh_keyfile", opt::value()->default_value( "/etc/contrail/ssl/private/server-privkey.pem"), "Sandesh ssl private key") - ("SANDESH.certfile", opt::value()->default_value( + ("SANDESH.sandesh_certfile", opt::value()->default_value( "/etc/contrail/ssl/certs/server.pem"), "Sandesh ssl certificate") - ("SANDESH.ca_cert", opt::value()->default_value( + ("SANDESH.sandesh_ca_cert", opt::value()->default_value( "/etc/contrail/ssl/certs/ca-cert.pem"), "Sandesh CA ssl certificate") ("SANDESH.sandesh_ssl_enable", @@ -431,11 +431,11 @@ void Options::Process(int argc, char *argv[], GetOptValue(var_map, xmpp_ca_cert_, "DEFAULT.xmpp_ca_cert"); GetOptValue(var_map, sandesh_config_.keyfile, - "SANDESH.keyfile"); + "SANDESH.sandesh_keyfile"); GetOptValue(var_map, sandesh_config_.certfile, - "SANDESH.certfile"); + "SANDESH.sandesh_certfile"); GetOptValue(var_map, sandesh_config_.ca_cert, - "SANDESH.ca_cert"); + "SANDESH.sandesh_ca_cert"); GetOptValue(var_map, sandesh_config_.sandesh_ssl_enable, "SANDESH.sandesh_ssl_enable"); GetOptValue(var_map, sandesh_config_.introspect_ssl_enable, diff --git a/src/dns/contrail-dns.conf b/src/dns/contrail-dns.conf index 077ad73e3c8..fedb5c2a3a8 100644 --- a/src/dns/contrail-dns.conf +++ b/src/dns/contrail-dns.conf @@ -65,6 +65,6 @@ sandesh_send_rate_limit=100 [SANDESH] # sandesh_ssl_enable=false # introspect_ssl_enable=false -# keyfile=/etc/contrail/ssl/private/server-privkey.pem -# certfile=/etc/contrail/ssl/certs/server.pem -# ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +# sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +# sandesh_certfile=/etc/contrail/ssl/certs/server.pem +# sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/nodemgr/analytics_nodemgr/contrail-analytics-nodemgr.conf b/src/nodemgr/analytics_nodemgr/contrail-analytics-nodemgr.conf index e99d4292639..da3869d572b 100644 --- a/src/nodemgr/analytics_nodemgr/contrail-analytics-nodemgr.conf +++ b/src/nodemgr/analytics_nodemgr/contrail-analytics-nodemgr.conf @@ -8,6 +8,6 @@ port=5998 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/nodemgr/config_nodemgr/contrail-config-nodemgr.conf b/src/nodemgr/config_nodemgr/contrail-config-nodemgr.conf index e99d4292639..da3869d572b 100644 --- a/src/nodemgr/config_nodemgr/contrail-config-nodemgr.conf +++ b/src/nodemgr/config_nodemgr/contrail-config-nodemgr.conf @@ -8,6 +8,6 @@ port=5998 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/nodemgr/control_nodemgr/contrail-control-nodemgr.conf b/src/nodemgr/control_nodemgr/contrail-control-nodemgr.conf index e99d4292639..da3869d572b 100644 --- a/src/nodemgr/control_nodemgr/contrail-control-nodemgr.conf +++ b/src/nodemgr/control_nodemgr/contrail-control-nodemgr.conf @@ -8,6 +8,6 @@ port=5998 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf b/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf index 5557ef08dee..8b85b4f203b 100644 --- a/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf +++ b/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf @@ -13,6 +13,6 @@ port=5998 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/nodemgr/main.py b/src/nodemgr/main.py index 11c024aa6d0..5381902ad14 100755 --- a/src/nodemgr/main.py +++ b/src/nodemgr/main.py @@ -78,9 +78,9 @@ def main(args_str=' '.join(sys.argv[1:])): SandeshSystem.get_sandesh_send_rate_limit(), } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -135,11 +135,11 @@ def main(args_str=' '.join(sys.argv[1:])): 'ip1:port1 ip2:port2') parser.add_argument("--sandesh_send_rate_limit", type=int, help="Sandesh send rate limit in messages/sec") - parser.add_argument("--keyfile", + parser.add_argument("--sandesh_keyfile", help="Sandesh ssl private key") - parser.add_argument("--certfile", + parser.add_argument("--sandesh_certfile", help="Sandesh ssl certificate") - parser.add_argument("--ca_cert", + parser.add_argument("--sandesh_ca_cert", help="Sandesh CA ssl certificate") parser.add_argument("--sandesh_ssl_enable", action="store_true", help="Enable ssl for sandesh connection") @@ -185,8 +185,9 @@ def main(args_str=' '.join(sys.argv[1:])): if _args.sandesh_send_rate_limit is not None: SandeshSystem.set_sandesh_send_rate_limit(_args.sandesh_send_rate_limit) - sandesh_config = SandeshConfig(_args.keyfile, _args.certfile, - _args.ca_cert, _args.sandesh_ssl_enable, _args.introspect_ssl_enable) + sandesh_config = SandeshConfig(_args.sandesh_keyfile, + _args.sandesh_certfile, _args.sandesh_ca_cert, + _args.sandesh_ssl_enable, _args.introspect_ssl_enable) # done parsing arguments if not 'SUPERVISOR_SERVER_URL' in os.environ: diff --git a/src/nodemgr/vrouter_nodemgr/contrail-vrouter-nodemgr.conf b/src/nodemgr/vrouter_nodemgr/contrail-vrouter-nodemgr.conf index e99d4292639..da3869d572b 100644 --- a/src/nodemgr/vrouter_nodemgr/contrail-vrouter-nodemgr.conf +++ b/src/nodemgr/vrouter_nodemgr/contrail-vrouter-nodemgr.conf @@ -8,6 +8,6 @@ port=5998 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/opserver/alarmgen_cfg.py b/src/opserver/alarmgen_cfg.py index 37e6804c708..c5e15bea9e6 100644 --- a/src/opserver/alarmgen_cfg.py +++ b/src/opserver/alarmgen_cfg.py @@ -91,9 +91,9 @@ def parse(self): } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -207,11 +207,11 @@ def parse(self): help="Password of keystone admin user") parser.add_argument("--admin_tenant_name", help="Tenant name for keystone admin user") - parser.add_argument("--keyfile", + parser.add_argument("--sandesh_keyfile", help="Sandesh ssl private key") - parser.add_argument("--certfile", + parser.add_argument("--sandesh_certfile", help="Sandesh ssl certificate") - parser.add_argument("--ca_cert", + parser.add_argument("--sandesh_ca_cert", help="Sandesh CA ssl certificate") parser.add_argument("--sandesh_ssl_enable", action="store_true", help="Enable ssl for sandesh connection") @@ -321,8 +321,8 @@ def keystone_params(self): 'admin_tenant_name': self._args.admin_tenant_name} def sandesh_config(self): - return SandeshConfig(self._args.keyfile, - self._args.certfile, - self._args.ca_cert, + return SandeshConfig(self._args.sandesh_keyfile, + self._args.sandesh_certfile, + self._args.sandesh_ca_cert, self._args.sandesh_ssl_enable, self._args.introspect_ssl_enable) diff --git a/src/opserver/contrail-alarm-gen.conf b/src/opserver/contrail-alarm-gen.conf index 076f8879764..f893b8df52b 100644 --- a/src/opserver/contrail-alarm-gen.conf +++ b/src/opserver/contrail-alarm-gen.conf @@ -22,6 +22,6 @@ partitions=30 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/opserver/contrail-analytics-api.conf b/src/opserver/contrail-analytics-api.conf index 63434a9e285..0376126bcec 100644 --- a/src/opserver/contrail-analytics-api.conf +++ b/src/opserver/contrail-analytics-api.conf @@ -26,6 +26,6 @@ partitions=30 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/opserver/opserver.py b/src/opserver/opserver.py index d6b35572d51..d4a9a5b8e91 100644 --- a/src/opserver/opserver.py +++ b/src/opserver/opserver.py @@ -877,9 +877,9 @@ def _parse_args(self, args_str=' '.join(sys.argv[1:])): 'admin_tenant_name': 'default-domain' } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False, 'introspect_ssl_enable': False } @@ -1018,11 +1018,11 @@ def _parse_args(self, args_str=' '.join(sys.argv[1:])): help="Port with local auth for admin access") parser.add_argument("--api_server_use_ssl", help="Use SSL to connect with API server") - parser.add_argument("--keyfile", + parser.add_argument("--sandesh_keyfile", help="Sandesh ssl private key") - parser.add_argument("--certfile", + parser.add_argument("--sandesh_certfile", help="Sandesh ssl certificate") - parser.add_argument("--ca_cert", + parser.add_argument("--sandesh_ca_cert", help="Sandesh CA ssl certificate") parser.add_argument("--sandesh_ssl_enable", action="store_true", help="Enable ssl for sandesh connection") @@ -1057,8 +1057,8 @@ def _parse_args(self, args_str=' '.join(sys.argv[1:])): auth_conf_info['api_server_port'] = int(api_server_info[1]) self._args.auth_conf_info = auth_conf_info self._args.conf_file = args.conf_file - self._args.sandesh_config = SandeshConfig(self._args.keyfile, - self._args.certfile, self._args.ca_cert, + self._args.sandesh_config = SandeshConfig(self._args.sandesh_keyfile, + self._args.sandesh_certfile, self._args.sandesh_ca_cert, self._args.sandesh_ssl_enable, self._args.introspect_ssl_enable) # end _parse_args diff --git a/src/query_engine/contrail-query-engine.conf b/src/query_engine/contrail-query-engine.conf index 608565e0636..430a6268da1 100644 --- a/src/query_engine/contrail-query-engine.conf +++ b/src/query_engine/contrail-query-engine.conf @@ -37,6 +37,6 @@ sandesh_send_rate_limit=100 [SANDESH] # sandesh_ssl_enable=false # introspect_ssl_enable=false -# keyfile=/etc/contrail/ssl/private/server-privkey.pem -# certfile=/etc/contrail/ssl/certs/server.pem -# ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +# sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +# sandesh_certfile=/etc/contrail/ssl/certs/server.pem +# sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/query_engine/options.cc b/src/query_engine/options.cc index 32f49e452ff..41fecb62ac4 100644 --- a/src/query_engine/options.cc +++ b/src/query_engine/options.cc @@ -158,13 +158,13 @@ void Options::Initialize(EventManager &evm, ("REDIS.password", opt::value()->default_value(""), "password for Redis Server") - ("SANDESH.keyfile", opt::value()->default_value( + ("SANDESH.sandesh_keyfile", opt::value()->default_value( "/etc/contrail/ssl/private/server-privkey.pem"), "Sandesh ssl private key") - ("SANDESH.certfile", opt::value()->default_value( + ("SANDESH.sandesh_certfile", opt::value()->default_value( "/etc/contrail/ssl/certs/server.pem"), "Sandesh ssl certificate") - ("SANDESH.ca_cert", opt::value()->default_value( + ("SANDESH.sandesh_ca_cert", opt::value()->default_value( "/etc/contrail/ssl/certs/ca-cert.pem"), "Sandesh CA ssl certificate") ("SANDESH.sandesh_ssl_enable", @@ -296,11 +296,11 @@ void Options::Process(int argc, char *argv[], GetOptValue(var_map, cassandra_password_, "CASSANDRA.cassandra_password"); GetOptValue(var_map, sandesh_config_.keyfile, - "SANDESH.keyfile"); + "SANDESH.sandesh_keyfile"); GetOptValue(var_map, sandesh_config_.certfile, - "SANDESH.certfile"); + "SANDESH.sandesh_certfile"); GetOptValue(var_map, sandesh_config_.ca_cert, - "SANDESH.ca_cert"); + "SANDESH.sandesh_ca_cert"); GetOptValue(var_map, sandesh_config_.sandesh_ssl_enable, "SANDESH.sandesh_ssl_enable"); GetOptValue(var_map, sandesh_config_.introspect_ssl_enable, diff --git a/src/storage/stats-daemon/stats-daemon.conf b/src/storage/stats-daemon/stats-daemon.conf index 7646a379693..7be4b9efacc 100644 --- a/src/storage/stats-daemon/stats-daemon.conf +++ b/src/storage/stats-daemon/stats-daemon.conf @@ -12,6 +12,6 @@ disc_server_ip=127.0.0.1 [SANDESH] #sandesh_ssl_enable=False #introspect_ssl_enable=False -#keyfile=/etc/contrail/ssl/private/server-privkey.pem -#certfile=/etc/contrail/ssl/certs/server.pem -#ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +#sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +#sandesh_certfile=/etc/contrail/ssl/certs/server.pem +#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem diff --git a/src/storage/stats-daemon/stats_daemon/storage_nodemgr.py b/src/storage/stats-daemon/stats_daemon/storage_nodemgr.py index 59d1e9c1498..f305824e001 100644 --- a/src/storage/stats-daemon/stats_daemon/storage_nodemgr.py +++ b/src/storage/stats-daemon/stats_daemon/storage_nodemgr.py @@ -847,9 +847,9 @@ def parse_args(args_str): #'sandesh_send_rate_limit': SandeshSystem.get_sandesh_send_rate_limit(), } sandesh_opts = { - 'keyfile': '/etc/contrail/ssl/private/server-privkey.pem', - 'certfile': '/etc/contrail/ssl/certs/server.pem', - 'ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', + 'sandesh_keyfile': '/etc/contrail/ssl/private/server-privkey.pem', + 'sandesh_certfile': '/etc/contrail/ssl/certs/server.pem', + 'sandesh_ca_cert': '/etc/contrail/ssl/certs/ca-cert.pem', 'sandesh_ssl_enable': False 'introspect_ssl_enable': False } @@ -891,11 +891,11 @@ def parse_args(args_str): help="Filename for the logs to be written to") parser.add_argument("--sandesh_send_rate_limit", type=int, help="Sandesh send rate limit in messages/sec") - parser.add_argument("--keyfile", + parser.add_argument("--sandesh_keyfile", help="Sandesh ssl private key") - parser.add_argument("--certfile", + parser.add_argument("--sandesh_certfile", help="Sandesh ssl certificate") - parser.add_argument("--ca_cert", + parser.add_argument("--sandesh_ca_cert", help="Sandesh CA ssl certificate") parser.add_argument("--sandesh_ssl_enable", action="store_true", help="Enable ssl for sandesh connection") @@ -933,8 +933,9 @@ def main(args_str=None): #if args.sandesh_send_rate_limit is not None: # SandeshSystem.set_sandesh_send_rate_limit( \ # args.sandesh_send_rate_limit) - sandesh_config = SandeshConfig(args.keyfile, args.certfile, - args.ca_cert, args.sandesh_ssl_enable, args.introspect_ssl_enable) + sandesh_config = SandeshConfig(args.sandesh_keyfile, + args.sandesh_certfile, args.sandesh_ca_cert, + args.sandesh_ssl_enable, args.introspect_ssl_enable) sandesh_global.init_generator( module_name, socket.gethostname(), diff --git a/src/vnsw/agent/contrail-vrouter-agent.conf b/src/vnsw/agent/contrail-vrouter-agent.conf index 8327e8e2d75..26f8076a61d 100644 --- a/src/vnsw/agent/contrail-vrouter-agent.conf +++ b/src/vnsw/agent/contrail-vrouter-agent.conf @@ -76,9 +76,9 @@ log_local=1 [SANDESH] # sandesh_ssl_enable=false # introspect_ssl_enable=false -# keyfile=/etc/contrail/ssl/private/server-privkey.pem -# certfile=/etc/contrail/ssl/certs/server.pem -# ca_cert=/etc/contrail/ssl/certs/ca-cert.pem +# sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem +# sandesh_certfile=/etc/contrail/ssl/certs/server.pem +# sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem [RESTART] # Enable/Disable backup of config and resource files diff --git a/src/vnsw/agent/init/agent_param.cc b/src/vnsw/agent/init/agent_param.cc index f2fea763503..e18a109fab3 100644 --- a/src/vnsw/agent/init/agent_param.cc +++ b/src/vnsw/agent/init/agent_param.cc @@ -753,11 +753,11 @@ void AgentParam::ParseServices() { void AgentParam::ParseSandesh() { GetValueFromTree(sandesh_config_.keyfile, - "SANDESH.keyfile"); + "SANDESH.sandesh_keyfile"); GetValueFromTree(sandesh_config_.certfile, - "SANDESH.certfile"); + "SANDESH.sandesh_certfile"); GetValueFromTree(sandesh_config_.ca_cert, - "SANDESH.ca_cert"); + "SANDESH.sandesh_ca_cert"); GetValueFromTree(sandesh_config_.sandesh_ssl_enable, "SANDESH.sandesh_ssl_enable"); GetValueFromTree(sandesh_config_.introspect_ssl_enable, @@ -1109,11 +1109,11 @@ void AgentParam::ParseServicesArguments void AgentParam::ParseSandeshArguments (const boost::program_options::variables_map &v) { GetOptValue(v, sandesh_config_.keyfile, - "SANDESH.keyfile"); + "SANDESH.sandesh_keyfile"); GetOptValue(v, sandesh_config_.certfile, - "SANDESH.certfile"); + "SANDESH.sandesh_certfile"); GetOptValue(v, sandesh_config_.ca_cert, - "SANDESH.ca_cert"); + "SANDESH.sandesh_ca_cert"); GetOptValue(v, sandesh_config_.sandesh_ssl_enable, "SANDESH.sandesh_ssl_enable"); GetOptValue(v, sandesh_config_.introspect_ssl_enable, @@ -1927,13 +1927,13 @@ AgentParam::AgentParam(bool enable_flow_options, opt::options_description sandesh("Sandesh specific options"); sandesh.add_options() - ("SANDESH.keyfile", opt::value()->default_value( + ("SANDESH.sandesh_keyfile", opt::value()->default_value( "/etc/contrail/ssl/private/server-privkey.pem"), "Sandesh ssl private key") - ("SANDESH.certfile", opt::value()->default_value( + ("SANDESH.sandesh_certfile", opt::value()->default_value( "/etc/contrail/ssl/certs/server.pem"), "Sandesh ssl certificate") - ("SANDESH.ca_cert", opt::value()->default_value( + ("SANDESH.sandesh_ca_cert", opt::value()->default_value( "/etc/contrail/ssl/certs/ca-cert.pem"), "Sandesh CA ssl certificate") ("SANDESH.sandesh_ssl_enable",