set force config drive in nova conf

This commit is contained in:
Jerry Zhao 2016-06-01 16:13:24 -07:00
parent 69551066a0
commit e4f07beb3e
4 changed files with 62 additions and 3 deletions

View File

@ -0,0 +1,18 @@
#
# Copyright 2016 Fortinet 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.
#
notice('MODULAR: fortinet configure_nova_for_fortigate')
include nova::configure_nova_for_fortigate

View File

@ -37,9 +37,6 @@ class neutron::configure_fortigate_fwaas {
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugin.ini --service fwaas upgrade head',
path => '/usr/bin',
refreshonly => true,
tries => 10,
try_sleep => 10,
require => Package['neutron-fwaas'],
notify => Service['neutron-server'],
}

View File

@ -0,0 +1,33 @@
#
# Copyright 2016 Fortinet 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 nova::configure_nova_for_fortigate {
ini_setting { 'nova.conf force config drive':
ensure => present,
path => '/etc/nova/nova.conf',
section => 'DEFAULT',
key_val_separator => '=',
setting => 'force_config_drive',
value => 'True',
notify => Service['nova-compute'],
}
service { 'nova-compute':
ensure => running,
enable => true,
}
}

View File

@ -28,6 +28,17 @@
puppet_manifest: puppet/manifests/configure-fortigate-fwaas.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 360
- id: configure-fortigate-nova
type: puppet
role: ['compute']
requires: [post_deployment_start]
required_for: [post_deployment_end]
parameters:
puppet_manifest: puppet/manifests/configure-fortigate-nova.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 360
#- id: fuel-plugin-fortinet-post-deployment-sh
# version: 2.0.0
# type: shell