Vrouter fixup added for compute nodes
Puppet manifests for compute nodes updated to install a fixup-vrouter init script and start it at boot to workaroung bug 1494638. Plugin repo priority adjusted. Netconfig task moved to separate puppet task, in some cases a shell task configuring network could cause timeouts. Closes-bug: #1495538 Closes-bug: #1493023 Change-Id: Iab09e925f9767d19d8d3f20e82587ddae39c0ecc
This commit is contained in:
parent
08cc4a9697
commit
88e8c75aa6
|
@ -1,3 +1,3 @@
|
||||||
Package: *
|
Package: *
|
||||||
Pin: release l=contrail
|
Pin: release l=contrail
|
||||||
Pin-Priority: 1100
|
Pin-Priority: 1200
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
#! /bin/sh
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: fixup-vrouter
|
||||||
|
# Required-Start: $network contrail-vrouter-agent
|
||||||
|
# Required-Stop: $network contrail-vrouter-agent
|
||||||
|
# Default-Start: 2 3 4 5
|
||||||
|
# Default-Stop: 0 1 6
|
||||||
|
# Short-Description: fixup-vrouter
|
||||||
|
# Description: This file starts opencontrail vrouter fixup for kernels > 3.13.0-62
|
||||||
|
#
|
||||||
|
### END INIT INFO
|
||||||
|
|
||||||
|
# Copyright 2015 Mirantis, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
sleep 10
|
||||||
|
ifconfig pkt2 up || exit 0
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: fixup-vrouter {start|stop}" >&2
|
||||||
|
exit 3
|
||||||
|
;;
|
||||||
|
esac
|
|
@ -67,6 +67,17 @@ class contrail::config ( $node_role ) {
|
||||||
content => template('contrail/contrail-vrouter-nodemgr.conf.erb'),
|
content => template('contrail/contrail-vrouter-nodemgr.conf.erb'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file {'/etc/init.d/fixup-vrouter':
|
||||||
|
ensure => present,
|
||||||
|
mode => '0755',
|
||||||
|
owner => 'root',
|
||||||
|
group => 'root',
|
||||||
|
source => 'puppet:///modules/contrail/fixup-vrouter.init',
|
||||||
|
} ->
|
||||||
|
service {'fixup-vrouter':
|
||||||
|
enable => true,
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,10 +36,11 @@
|
||||||
# Config default network, first of all
|
# Config default network, first of all
|
||||||
- role: ['base-os']
|
- role: ['base-os']
|
||||||
stage: pre_deployment
|
stage: pre_deployment
|
||||||
type: shell
|
type: puppet
|
||||||
parameters:
|
parameters:
|
||||||
cmd: if hiera user_node_name | egrep '^contrail-[0-9]'; then puppet apply /etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp; fi
|
puppet_modules: /etc/puppet/modules
|
||||||
timeout: 720
|
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp
|
||||||
|
timeout: 3600
|
||||||
- role: ['base-os']
|
- role: ['base-os']
|
||||||
stage: pre_deployment
|
stage: pre_deployment
|
||||||
type: puppet
|
type: puppet
|
||||||
|
|
Loading…
Reference in New Issue