Skip to content

Commit

Permalink
Rename sandesh ssl options
Browse files Browse the repository at this point in the history
Naming convention for ssl options (keyfile, certfile, ca_cert) under [SANDESH]
conflicts with [SECURITY] options in contrail-api. Hence, prepended the
ssl options under [SANDESH] with sandesh_

Change-Id: I23f71d103270209eae5951ef044832bacff6e667
Closes-Bug: #1661084
  • Loading branch information
Sundaresan Rajangam committed Feb 2, 2017
1 parent 7fd1497 commit 1da9155
Show file tree
Hide file tree
Showing 40 changed files with 191 additions and 189 deletions.
6 changes: 3 additions & 3 deletions src/analytics/contrail-broadview/contrail-broadview.conf
Expand Up @@ -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
18 changes: 9 additions & 9 deletions src/analytics/contrail-broadview/contrail_broadview/config.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions src/analytics/contrail-collector.conf
Expand Up @@ -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
Expand Up @@ -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
Expand Up @@ -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
}
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions src/analytics/contrail-topology/contrail-topology.conf
Expand Up @@ -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
18 changes: 9 additions & 9 deletions src/analytics/contrail-topology/contrail_topology/config.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions src/analytics/options.cc
Expand Up @@ -339,13 +339,13 @@ void Options::Initialize(EventManager &evm,
("KEYSTONE.cafile", opt::value<string>()->default_value(
"/etc/contrail/ks-ca"), "Keystone CA chain")

("SANDESH.keyfile", opt::value<string>()->default_value(
("SANDESH.sandesh_keyfile", opt::value<string>()->default_value(
"/etc/contrail/ssl/private/server-privkey.pem"),
"Sandesh ssl private key")
("SANDESH.certfile", opt::value<string>()->default_value(
("SANDESH.sandesh_certfile", opt::value<string>()->default_value(
"/etc/contrail/ssl/certs/server.pem"),
"Sandesh ssl certificate")
("SANDESH.ca_cert", opt::value<string>()->default_value(
("SANDESH.sandesh_ca_cert", opt::value<string>()->default_value(
"/etc/contrail/ssl/certs/ca-cert.pem"),
"Sandesh CA ssl certificate")
("SANDESH.sandesh_ssl_enable",
Expand Down Expand Up @@ -630,11 +630,11 @@ void Options::Process(int argc, char *argv[],
GetOptValue<string>(var_map, ks_ca_, "KEYSTONE.cafile");

GetOptValue<string>(var_map, sandesh_config_.keyfile,
"SANDESH.keyfile");
"SANDESH.sandesh_keyfile");
GetOptValue<string>(var_map, sandesh_config_.certfile,
"SANDESH.certfile");
"SANDESH.sandesh_certfile");
GetOptValue<string>(var_map, sandesh_config_.ca_cert,
"SANDESH.ca_cert");
"SANDESH.sandesh_ca_cert");
GetOptValue<bool>(var_map, sandesh_config_.sandesh_ssl_enable,
"SANDESH.sandesh_ssl_enable");
GetOptValue<bool>(var_map, sandesh_config_.introspect_ssl_enable,
Expand Down
6 changes: 3 additions & 3 deletions src/config/api-server/contrail-api.conf
Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/config/api-server/utils.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/config/device-manager/contrail-device-manager.conf
Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/config/device-manager/device_manager/device_manager.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/config/schema-transformer/contrail-schema.conf
Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/config/schema-transformer/to_bgp.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/config/svc-monitor/contrail-svc-monitor.conf
Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/config/svc-monitor/svc_monitor/svc_monitor.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/container/kube-manager/contrail-kubernetes.conf
Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/container/kube-manager/kube_manager/common/args.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions src/container/mesos-manager/contrail-mesos.conf
Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/container/mesos-manager/mesos_manager/common/args.py
Expand Up @@ -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
}
Expand Down Expand Up @@ -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

0 comments on commit 1da9155

Please sign in to comment.