Fix connection between vmware and openstack parts

- increase cpu amount and disk space for ContrailVM
- Fix order of package installation on compute-vmware
- Fix vrouter restart
- Fix typos

Change-Id: If7f4364df6de418372506cce9af8360138fc04ac

deployment_scripts/puppet/modules/contrail/manifests/compute/vmware_pkg.pp

@@ -32,9 +32,9 @@ exec { 'fix wrong tzdata':
 package { $vcenter_compute_pkgs: }
 
 # Install vCenter-specific contrail packages
+package { 'contrail-install-vcenter-plugin': } ->
 package { ['libxml-commons-external-java', 'libxml-commons-resolver1.1-java', 'libxerces2-java',
             'libslf4j-java', 'libnetty-java', 'libjline-java', 'libzookeeper-java']: } ->
-package { 'contrail-install-vcenter-plugin': } ->
 package { ['libcontrail-java-api','libcontrail-vijava','libcontrail-vrouter-java-api']: } ->
 package { 'contrail-vcenter-plugin': }
 

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

@@ -17,9 +17,8 @@ class contrail::contrail_vmware {
     $phys_dev_facter = regsubst($::contrail::phys_dev, '\.' , '_')
     $dev_mac         = getvar("::macaddress_${phys_dev_facter}")
 
-
-    $install_packages = ['contrail-utils', 'contrail-vrouter-dkms', 'contrail-vrouter-common',
-      'contrail-nova-vif', 'iproute2']
+    $install_packages = ['contrail-utils', 'contrail-vrouter-dkms',
+      'contrail-vrouter-common', 'contrail-nova-vif', 'iproute2']
 
     l23network::l3::ifconfig { $contrail::vmware_iface_name: ipaddr => 'none' }
 
@@ -36,7 +35,6 @@ class contrail::contrail_vmware {
       ensure => present,
       tag    => ['install'],
     } ->
-
     file {'/etc/contrail/agent_param':
       ensure  => present,
       content => template('contrail/agent_param.erb'),
@@ -54,7 +52,7 @@ class contrail::contrail_vmware {
       'DEFAULT/syslog_facility'                   : value => 'LOG_LOCAL0';
       'DEFAULT/headless_mode'                     : value => true;
       'DISCOVERY/server'                          : value => $contrail::contrail_private_vip;
-      'DISCOVERY/max_control_nodes'               : value => '2';               # TODO check this param
+      'DISCOVERY/max_control_nodes'               : value => '2';
       'HYPERVISOR/type'                           : value => 'vmware';
       'HYPERVISOR/vmware_mode'                    : value => 'vcenter';
       'HYPERVISOR/vmware_physical_interface'      : value => $contrail::vmware_iface_name;
@@ -75,25 +73,23 @@ class contrail::contrail_vmware {
       command => '/bin/rm /etc/init/supervisor-vrouter.override',
       onlyif  => '/usr/bin/test -f /etc/init/supervisor-vrouter.override',
       require => Package[$install_packages],
-    }
-
-    service {'supervisor-vrouter':
-      ensure     => running,
-      enable     => true,
-      hasrestart => false,
-      restart    => 'service supervisor-vrouter stop && \
-modprobe -r vrouter && \
-sync && \
-echo 3 > /proc/sys/vm/drop_caches && \
-echo 1 > /proc/sys/vm/compact_memory && \
-service supervisor-vrouter start',
-      subscribe  => [Package[$install_packages],
+    } ->
+    exec { 'restart_supervisor_vrouter':
+      path       => '/usr/bin:/usr/sbin:/bin:/sbin',
+      command    => 'service supervisor-vrouter stop && \
+    modprobe -r vrouter && \
+    sync && \
+    echo 3 > /proc/sys/vm/drop_caches && \
+    echo 1 > /proc/sys/vm/compact_memory && \
+    service supervisor-vrouter start;sleep 10;ip link show vhost0 || exit 1',
+      tries       => 3,
+      refreshonly => true,
+      subscribe   => [Package[$install_packages],
                     File['/etc/contrail/agent_param']
                     ],
     }
 
-    Contrail_vrouter_nodemgr_config <||> ~> Service['supervisor-vrouter']
-    Contrail_vrouter_agent_config   <||> ~> Service['supervisor-vrouter']
+    Package[$install_packages] -> Contrail_vrouter_nodemgr_config <||> ~> Exec['restart_supervisor_vrouter']
+    Package[$install_packages] -> Contrail_vrouter_agent_config   <||> ~> Exec['restart_supervisor_vrouter']
 
 }
-

deployment_scripts/spawner.py

@@ -674,8 +674,8 @@ if __name__ == '__main__':
     esxi_uplink_priv = Vcenter_base.get_contrail_settings(env_id, 'esxi_uplink_priv')
     storage_name = Vcenter_base.get_contrail_settings(env_id, 'esxi_datastore_name')
 
-    vm_disk_size = 10  # GB
-    vm_cpu = 2  # Amount
+    vm_disk_size = 20  # GB
+    vm_cpu = 3  # Amount
     if args.reduce_vm_params:
         vm_memory = 2048  # MB
     else:
@@ -716,7 +716,7 @@ if __name__ == '__main__':
         dvs.add_hosts(hosts_list=host_list_dvs_int, dvs_name=dvs_internal, attach_uplink=False)
         dvpg.create(dv_pg_name=dvpg_internal, dvs_name=dvs_internal, vlan_type='trunk', vlan_list=[0, 4094])
 
-        dvs.create(dvs_name=dvs_private, private_vlan=False, max_mtu=dvs_private)
+        dvs.create(dvs_name=dvs_private, private_vlan=False, max_mtu=dvs_mtu_priv)
         dvs.add_hosts(hosts_list=host_list_dvs_priv, dvs_name=dvs_private, attach_uplink=True)
         dvpg.create(dv_pg_name=dvpg_private, dvs_name=dvs_private, vlan_type='trunk', vlan_list=[0, 4094])
 

deployment_tasks.yaml

@@ -1045,25 +1045,23 @@
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 720
 
-- id: contrail-vmware-task
+- id: contrail-vmware-network
   type: puppet
   version: 2.0.0
   groups: [contrail-vmware]
-  required_for: [contrail-vmware-network]
-  requires: [hosts, ssl-dns-setup]
+  required_for: [contrail-vmware-task]
+  requires: [deploy_start, hosts]
   parameters:
-    puppet_manifest: puppet/manifests/contrail-vmware.pp
+    puppet_manifest: puppet/manifests/contrail-compute-network.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 720
-  cross-depends:
-    - name: contrail-db-provision-all
 
 - id: contrail-vmware-provision
   type: puppet
   version: 2.0.0
   groups: [contrail-vmware]
-  required_for: [deploy_end]
-  requires: [contrail-vmware-task]
+  required_for: [contrail-vmware-task, deploy_end]
+  requires: [contrail-utils]
   parameters:
     puppet_manifest: puppet/manifests/contrail-compute-provision.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
@@ -1072,4 +1070,15 @@
     - name: openstack-controller-provision
       role: primary-controller
 
-
+- id: contrail-vmware-task
+  type: puppet
+  version: 2.0.0
+  groups: [contrail-vmware]
+  required_for: [deploy_end]
+  requires: [hosts, ssl-dns-setup]
+  parameters:
+    puppet_manifest: puppet/manifests/contrail-vmware.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 720
+  cross-depends:
+    - name: contrail-db-provision-all