commit ed04742b625d30eaed1ee80fbdd75d2324f1d73b
author Marek Celoud <mceloud@mirantis.com> Mon Apr 10 17:41:24 2017 +0200
committer Marek Celoud <mceloud@mirantis.com> Mon Apr 10 17:41:24 2017 +0200
tree 06f6faaf9fa5a61ff3cd1d3a417449bd523c98da
parent 62ec1661a8eef418ecef6fdafa9014a8037ae602

add fixes for mcp1.1 contrail

Change-Id: I690f8c140c75d57e03c0bbb6da6fed646a8ead8a

classes/cluster/virtual-mcp11-contrail/openstack/compute.yml

diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
index 1f157c2..f52f34b 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
@@ -62,3 +62,7 @@
           - host: ${_param:openstack_control_node01_address}
           - host: ${_param:openstack_control_node02_address}
           - host: ${_param:openstack_control_node03_address}
+  opencontrail:
+    common:
+      network:
+        host: ${_param:openstack_control_address}

classes/cluster/virtual-mcp11-contrail/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index 75d679f..0edfa04 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -35,7 +35,7 @@
     nova_service_host: ${_param:openstack_control_address}
     nova_vncproxy_url: http://${_param:openstack_control_address}:8060
     neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:opencontrail_control_address}
+    neutron_service_host: ${_param:openstack_control_address}
     glusterfs_service_host: ${_param:openstack_control_address}
     mysql_admin_user: root
     mysql_admin_password: workshop