Support for Ubuntu 14.04 kernel 48-generic

Contrail-vrouter-dkms package added to support new Ubuntu kernels,
more recent than 35-generic.
Bugfix: contrail vrouter provision script arguments fixed.

Change-Id: I36efab2c04978cf22c9ea0ed0920cdb061e8613d
This commit is contained in:
Oleksandr Martsyniuk
2015-04-02 18:44:32 +03:00
parent d6ee6642d8
commit 9130fa41e0
3 changed files with 3 additions and 5 deletions

View File

@@ -12,7 +12,7 @@ case $operatingsystem {
} ->
class { 'contrail::package':
install => ['contrail-openstack-vrouter','iproute2','haproxy','libatm1'],
install => ['contrail-openstack-vrouter','contrail-vrouter-dkms','iproute2','haproxy','libatm1'],
remove => ['openvswitch-common','openvswitch-datapath-lts-saucy-dkms','openvswitch-switch','nova-network','nova-api'],
}

View File

@@ -10,7 +10,7 @@ class contrail::provision ( $node_role ) {
'compute': {
exec { 'provision-vrouter':
path => '/bin:/usr/bin/',
command => "python /opt/contrail/utils/provision_vrouter.py --host_name ${::hostname} \
command => "python /opt/contrail/utils/provision_vrouter.py --host_name ${::fqdn} \
--host_ip ${contrail::address} --api_server_ip ${contrail::contrail_mgmt_vip} --openstack_ip ${contrail::mos_mgmt_vip} \
--admin_user neutron --admin_password ${contrail::admin_token} --admin_tenant_name services --oper add",
}

View File

@@ -82,12 +82,10 @@
puppet_manifest: puppet/manifests/site-compute-post.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
# TODO: Use "type: reboot" when new plugin sdk will be released.
- role: ['compute']
stage: post_deployment
type: shell
type: reboot
parameters:
cmd: '/sbin/reboot'
timeout: 720
- role: ['base-os']
stage: post_deployment