add fixes for mcp1.1 contrail
Change-Id: I690f8c140c75d57e03c0bbb6da6fed646a8ead8a
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 04b74b3..c3e5600 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -41,7 +41,7 @@
opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
- opencontrail_control_address: 172.16.10.253
+ opencontrail_control_address: 172.16.10.252
opencontrail_control_node01_address: 172.16.10.111
opencontrail_control_node02_address: 172.16.10.112
opencontrail_control_node03_address: 172.16.10.113
diff --git a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
index 0606f02..9abe3e7 100644
--- a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
@@ -18,7 +18,7 @@
parameters:
_param:
keepalived_vip_interface: eth1
- cluster_vip_address: ${_param:openstack_control_address}
+ cluster_vip_address: ${_param:opencontrail_control_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ntw01
cluster_node01_address: ${_param:opencontrail_control_node01_address}
@@ -46,9 +46,19 @@
port: 9042
network:
host: ${_param:openstack_control_address}
+ identity:
+ host: ${_param:openstack_control_address}
common:
network:
host: ${_param:openstack_control_address}
+ identity:
+ host: ${_param:openstack_control_address}
config:
network:
host: ${_param:openstack_control_address}
+ identity:
+ host: ${_param:openstack_control_address}
+ message_queue:
+ engine: rabbitmq
+ host: ${_param:openstack_control_address}
+ port: 5672
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}
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