Skip to content

Commit

Permalink
Merge "Closes-Bug: #1597934 - Loosening roles + params check to allow…
Browse files Browse the repository at this point in the history
… Central Keystone Provision"
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Jul 20, 2016
2 parents 7c19c52 + a823844 commit 9f225b5
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions src/server_mgr_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -892,15 +892,10 @@ def validate_openstack_only_cluster(self, cluster_id):
self.log_and_raise_exception(msg)

openstack_manage_amqp_check = cluster_openstack_params.get("openstack_manage_amqp", None)
configured_nova_params = cluster_openstack_params.get("nova", None)
if configured_nova_params:
configured_nova_neutron_ip = configured_nova_params.get("neutron_ip_to_use", None)
else:
configured_nova_neutron_ip = None
if configured_nova_neutron_ip and openstack_manage_amqp_check:
if openstack_manage_amqp_check:
pass
else:
msg = "In a Cluster with only Openstack role defined, you need to configure both openstack::openstack_manage_amqp = true and openstck::nova::neutron_ip_to_use pointing to a Cfgm node\n"
msg = "In a Cluster with only Openstack role defined, you need to configure openstack::openstack_manage_amqp = true\n"
self.log_and_raise_exception(msg)

def _validate_roles(self, cluster_id):
Expand Down

0 comments on commit 9f225b5

Please sign in to comment.