x/fuel-plugin-contrail
Code Issues Proposed changes

A workaround that allows to complete re-deploy

Browse Source 
Network configuration substituted by noop manifest.

Change-Id: I2cf35bc5018f1985b527eb36053c013041b58065
This commit is contained in:
Vyacheslav Struk
2015-06-22 19:10:53 +03:00
parent 6f96acc61e
commit bc14607410
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
deployment_scripts/puppet/manifests/site-common-pre.pp
View File

@@ -12,6 +12,20 @@
# License for the specific language governing permissions and limitations
# under the License.
Exec { path => '/bin:/sbin:/usr/bin:/usr/sbin', refresh => 'echo NOOP_ON_REFRESH'}
# Temporary dirty hack. Network configuration fails because of deployed contrail [FIXME]
############################################################################
exec {'no_predefined_network_hack':
command => 'sed -i -e "82s/.*/\tif\ false\ {/" /etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp'
}
exec {'no_network_reconfigure':
command => 'echo "#NOOP here. Modified by contrail plugin" > /etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-compute.pp',
onlyif => 'test -f /opt/contrail/provision-vrouter-DONE'
}
############################################################################
case $operatingsystem
{
CentOS: