Opencontrail-related changes to configs and provisioning

- listen ports for Opencontrail services clarified
- provisioning routines updated

Change-Id: I5fc9488fd4d4f474b2f833139bb91c987b16d975

deployment_scripts/puppet/manifests/site-contrail-post3.pp

@@ -19,7 +19,7 @@ if $contrail::node_name == $contrail::deployment_node {
   class { 'contrail::cfgm': } ->
   class { 'contrail::control': } ->
   class { 'contrail::analytics': } ->
-  class { 'contrail::webui': }
+  class { 'contrail::webui': } ->
   class {'contrail::provision':
     node_role => $node_role,
   }

deployment_scripts/puppet/manifests/site-contrail-post4.pp

@@ -19,7 +19,7 @@ if $contrail::node_name =~ /^contrail.\d+$/ {
   class { 'contrail::cfgm': } ->
   class { 'contrail::control': } ->
   class { 'contrail::analytics': } ->
-  class { 'contrail::webui': }
+  class { 'contrail::webui': } ->
   class {'contrail::provision':
     node_role => $node_role,
   }

deployment_scripts/puppet/modules/contrail/manifests/provision.pp

@@ -77,11 +77,15 @@ then exit 1; fi",
       }
     }
     'compute': {
+      $host_name = $contrail::distribution ? {
+        'open'   => $::hostname,
+        default  => $::fqdn,
+      }
       exec { 'provision-vrouter':
         path    => '/bin:/usr/bin/',
         command => "python /opt/contrail/utils/provision_vrouter.py \
 --api_server_ip ${contrail::contrail_mgmt_vip} --api_server_port 8082 --openstack_ip ${contrail::mos_mgmt_vip} \
---oper add --host_name ${::fqdn} --host_ip ${contrail::address} \
+--oper add --host_name ${host_name} --host_ip ${contrail::address} \
 --admin_user neutron --admin_tenant_name services --admin_password ${contrail::service_token} \
 && touch /opt/contrail/provision-vrouter-DONE",
         creates => '/opt/contrail/provision-vrouter-DONE',

deployment_scripts/puppet/modules/contrail/templates/contrail-api.conf.erb

@@ -18,7 +18,7 @@ ifmap_username=api-server
 ifmap_password=api-server
 cassandra_server_list=<%= priv_ip.map{ |ip| "#{ip}:9160" }.join(' ') %>
 listen_ip_addr=0.0.0.0
-listen_port=8082
+listen_port=9100
 multi_tenancy=True
 log_file=/var/log/contrail/contrail-api.log
 log_local=1

deployment_scripts/puppet/modules/contrail/templates/contrail-discovery.conf.erb

@@ -15,7 +15,7 @@ end
 zk_server_ip=<%= priv_ip.join(',') %>
 zk_server_port=2181
 listen_ip_addr=0.0.0.0
-listen_port=5998
+listen_port=9110
 log_local=True
 log_file=/var/log/contrail/discovery.log
 cassandra_server_list=<%= priv_ip.map{ |ip| "#{ip}:9160" }.join(' ') %>