Skip to content

Commit

Permalink
Merge "make the argument control_ip_list optional for setup_vnc_confi…
Browse files Browse the repository at this point in the history
…g, this will allow analytics/config to be installed/provisioned without control" into R3.1
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Jul 20, 2016
2 parents 2686fb7 + 5e037e2 commit 68bc43e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion contrail_provisioning/config/setup.py
Expand Up @@ -46,6 +46,7 @@ def __init__(self, args_str = None):
'manage_neutron': 'yes',
'orchestrator' : 'openstack',
'amqp_port': '5672',
'control_ip_list': '',
}
self.parse_args(args_str)

Expand Down Expand Up @@ -77,7 +78,7 @@ def parse_args(self, args_str):
parser.add_argument("--zookeeper_ip_list", help = "List of IP Addresses of zookeeper servers",
nargs='+', type=str)
parser.add_argument("--control_ip_list", help = "List of IP Addresses of Control nodes",
nargs='+', type=str)
type=str)
parser.add_argument("--quantum_port", help = "Quantum Server port")
parser.add_argument("--quantum_service_protocol", help = "Protocol of quantum/neutron for nova to use ")
parser.add_argument("--keystone_auth_protocol",
Expand Down

0 comments on commit 68bc43e

Please sign in to comment.