Add IVS package and not install lldp for P+V compute nodes

Change-Id: I1a00370e55e645c0a07593d39da47f5ac678a249
This commit is contained in:
Kanzhe Jiang 2016-02-21 00:25:35 -08:00
parent 10f4965473
commit ec0604dbb2
7 changed files with 19 additions and 34 deletions

View File

@ -13,6 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
notice('MODULAR: bigswitch network-config')
notice('MODULAR: bigswitch compute-network-config')
include bcf::params
include bcf::p_only::network
if $bcf::params::openstack::bcf_mode == 'P-Only' {
include bcf::p_only::compute-network-config
}

View File

@ -13,7 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
class bcf::p_v::network {
notice('MODULAR: bigswitch general-network-config')
class bcf::p_v::general-network-config {
include bcf
include bcf::params

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
class bcf::p_only::network {
class bcf::p_only::compute-network-config {
include bcf
include bcf::params

View File

@ -1,28 +0,0 @@
#
# 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.
#
class bcf::params {
include bcf::params::openstack
case $::operatingsystem {
'Ubuntu', 'Debian': {
}
'CentOS', 'RedHat': {
}
default: {
}
}
}

View File

@ -3,11 +3,20 @@
- id: lacp-bond
type: puppet
groups: [primary-controller, controller, compute, ceph-osd]
groups: [primary-controller, controller, ceph-osd]
required_for: [openstack-controller, connectivity_tests]
requires: [netconfig]
parameters:
puppet_manifest: puppet/manifests/network-config.pp
puppet_manifest: puppet/manifests/general-network-config.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
- id: compute-lacp-bond
type: puppet
groups: [compute]
required_for: [openstack-controller, connectivity_tests]
requires: [netconfig]
parameters:
puppet_manifest: puppet/manifests/compute-network-config.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
- id: openstack-cleanup