Fixed bug: Network issue while deploying OpenStack nodes.
Change-Id: I6775ca64f8f55890543f1380d11b6579ba1cc0e2
This commit is contained in:
parent
df37614679
commit
042cc51940
|
@ -50,8 +50,6 @@ class nitrous {
|
||||||
$opsvm_pool_type = $hiera_values['selective_opsvm_pool']
|
$opsvm_pool_type = $hiera_values['selective_opsvm_pool']
|
||||||
|
|
||||||
$kvm_hosts = opsvm_filter($ops_vms_array, $kvm_hostname, br-fw-admin, br-mgmt)
|
$kvm_hosts = opsvm_filter($ops_vms_array, $kvm_hostname, br-fw-admin, br-mgmt)
|
||||||
$vlan_tag = split($stg_nm, '\.')
|
|
||||||
$vlan_id = $::nitrous::vlan_tag[1]
|
|
||||||
$nic_bond = pick($network_scheme['transformations'])
|
$nic_bond = pick($network_scheme['transformations'])
|
||||||
$mgmt = $nic_bond[6]
|
$mgmt = $nic_bond[6]
|
||||||
$mgmt_brg = pick($mgmt['bridge'])
|
$mgmt_brg = pick($mgmt['bridge'])
|
||||||
|
@ -62,7 +60,9 @@ class nitrous {
|
||||||
$prv = $nic_bond[8]
|
$prv = $nic_bond[8]
|
||||||
$prv_brg = pick($prv['bridge'])
|
$prv_brg = pick($prv['bridge'])
|
||||||
$prv_nm = pick($prv['name'])
|
$prv_nm = pick($prv['name'])
|
||||||
|
$vlan_tag = split($prv_nm, '\.')
|
||||||
|
$vlan_id = $::nitrous::vlan_tag[1]
|
||||||
|
|
||||||
if !($proxy_line == 'undef') {
|
if !($proxy_line == 'undef') {
|
||||||
file_line { 'env_proxy':
|
file_line { 'env_proxy':
|
||||||
ensure => 'present',
|
ensure => 'present',
|
||||||
|
@ -73,7 +73,7 @@ class nitrous {
|
||||||
|
|
||||||
exec { "src_bash":
|
exec { "src_bash":
|
||||||
command => "bash -c 'source $env_conf'",
|
command => "bash -c 'source $env_conf'",
|
||||||
path => '/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin',
|
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games',
|
||||||
}
|
}
|
||||||
|
|
||||||
file_line { 'agent_conf' :
|
file_line { 'agent_conf' :
|
||||||
|
@ -92,23 +92,44 @@ class nitrous {
|
||||||
}
|
}
|
||||||
|
|
||||||
if !($vlan_id == '') {
|
if !($vlan_id == '') {
|
||||||
file { '/usr/local/bin/rm_vlan.sh':
|
exec { 'add_brg':
|
||||||
ensure => 'present',
|
command => "brctl addif br-mgmt bond0",
|
||||||
owner => 'root',
|
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games',
|
||||||
group => 'root',
|
|
||||||
mode => '0766',
|
|
||||||
content => template('nitrous/vlan.erb'),
|
|
||||||
}
|
}
|
||||||
exec { 'remove_vlan':
|
|
||||||
command => '/usr/local/bin/rm_vlan.sh',
|
|
||||||
path => '/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin',
|
|
||||||
}
|
|
||||||
exec { 'add_brg':
|
|
||||||
command => "brctl addif br-mgmt bond0",
|
|
||||||
path => '/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin',
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
define rm_br::rm_int( $brg, $nm){
|
||||||
|
if !($::nitrous::vlan_id == '') {
|
||||||
|
exec { "brctl delif $brg $nm && sleep 3":
|
||||||
|
onlyif => "brctl show $brg | grep -F $nm",
|
||||||
|
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games',
|
||||||
|
logoutput => true,
|
||||||
|
}->
|
||||||
|
exec { "vconfig rem $nm && sleep 3":
|
||||||
|
onlyif => "ip addr show | grep -F $nm",
|
||||||
|
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games',
|
||||||
|
logoutput => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$br_int ={
|
||||||
|
'mgmt' =>{
|
||||||
|
brg => "$mgmt_brg",
|
||||||
|
nm => "$mgmt_nm",
|
||||||
|
},
|
||||||
|
'stg' =>{
|
||||||
|
brg => "$stg_brg",
|
||||||
|
nm => "$stg_nm",
|
||||||
|
},
|
||||||
|
'prv' =>{
|
||||||
|
brg => "$prv_brg",
|
||||||
|
nm => "$prv_nm",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
create_resources(rm_br::rm_int, $br_int)
|
||||||
|
|
||||||
file { '/usr/bin/opsvm':
|
file { '/usr/bin/opsvm':
|
||||||
ensure => 'present',
|
ensure => 'present',
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Copyright (c) 2016 AT&T 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.
|
|
||||||
|
|
||||||
brctl delif <%= @mgmt_brg %> <%= @mgmt_nm %>
|
|
||||||
if [ $? == 0 ]; then
|
|
||||||
echo "Deleted <%= @mgmt_nm %>" > /var/log/nitrous-vlan.log
|
|
||||||
vconfig rem <%= @mgmt_nm %>
|
|
||||||
if [ $? == 0 ]; then
|
|
||||||
echo "Removed <%= @mgmt_nm %>" >> /var/log/nitrous-vlan.log
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
brctl delif <%= @stg_brg %> <%= @stg_nm %>
|
|
||||||
if [ $? == 0 ]; then
|
|
||||||
echo "Deleted <%= @stg_nm %>" >> /var/log/nitrous-vlan.log
|
|
||||||
vconfig rem <%= @stg_nm %>
|
|
||||||
if [ $? == 0 ]; then
|
|
||||||
echo "Removed <%= @stg_nm %>" >> /var/log/nitrous-vlan.log
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
brctl delif <%= @prv_brg %> <%= @prv_nm %>
|
|
||||||
if [ $? == 0 ]; then
|
|
||||||
echo "Deleted <%= @prv_nm %>" >> /var/log/nitrous-vlan.log
|
|
||||||
vconfig rem <%= @prv_nm %>
|
|
||||||
if [ $? == 0 ]; then
|
|
||||||
echo "Removed <%= @prv_nm %>" >> /var/log/nitrous-vlan.log
|
|
||||||
fi
|
|
||||||
fi
|
|
Loading…
Reference in New Issue