Skip to content

Commit

Permalink
Updated contrail labs tasks to configure neutron url properly based o…
Browse files Browse the repository at this point in the history
…n openstack version

Change-Id: I046806abb31a07283c83e2fddb3b8a69d34560ee
Closes-Bug: 1583456
  • Loading branch information
npchandran committed May 31, 2016
1 parent 0115cdb commit 0e8f5a6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fabfile/contraillabs/rdo.py
Expand Up @@ -113,7 +113,8 @@ def setup_rhosp_node():
authserver_ip = get_authserver_ip()
# For juno, neutron_url is deprecated instead use "url" in neutron section
api_version = sudo("rpm -q --queryformat='%{VERSION}' openstack-nova-api")
is_juno_or_higher = LooseVersion(api_version) >= LooseVersion('2014.2.2')
is_juno_or_higher = LooseVersion(api_version) >= LooseVersion('2014.2.2') or\
LooseVersion(api_version) < LooseVersion('2013') and LooseVersion(api_version) >= LooseVersion('12.0')
if is_juno_or_higher:
sudo("openstack-config --set /etc/nova/nova.conf neutron url http://%s:9696" % cfgm_0_ip)
else:
Expand Down

0 comments on commit 0e8f5a6

Please sign in to comment.