summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Zhao <xyzjerry@gmail.com>2016-06-01 16:13:24 -0700
committerJerry Zhao <xyzjerry@gmail.com>2016-06-01 16:13:24 -0700
commite4f07beb3e9a680d9d7c1d2469f59bd010089340 (patch)
treeace75670b1fd5bbafe0c874ae20a8cf33a92c74c
parent69551066a0dbd65382268c7a17cd4610b8d3ab4e (diff)
set force config drive in nova conf
-rw-r--r--deployment_scripts/puppet/manifests/configure-fortigate-nova.pp18
-rw-r--r--deployment_scripts/puppet/modules/neutron/manifests/configure_fortigate_fwaas.pp3
-rw-r--r--deployment_scripts/puppet/modules/nova/manifests/configure_nova_for_fortigate.pp33
-rw-r--r--deployment_tasks.yaml11
4 files changed, 62 insertions, 3 deletions
diff --git a/deployment_scripts/puppet/manifests/configure-fortigate-nova.pp b/deployment_scripts/puppet/manifests/configure-fortigate-nova.pp
new file mode 100644
index 0000000..1e3578f
--- /dev/null
+++ b/deployment_scripts/puppet/manifests/configure-fortigate-nova.pp
@@ -0,0 +1,18 @@
1#
2# Copyright 2016 Fortinet Inc.
3#
4# Licensed under the Apache License, Version 2.0 (the "License"); you may
5# not use this file except in compliance with the License. You may obtain
6# a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13# License for the specific language governing permissions and limitations
14# under the License.
15#
16notice('MODULAR: fortinet configure_nova_for_fortigate')
17include nova::configure_nova_for_fortigate
18
diff --git a/deployment_scripts/puppet/modules/neutron/manifests/configure_fortigate_fwaas.pp b/deployment_scripts/puppet/modules/neutron/manifests/configure_fortigate_fwaas.pp
index 43e5938..a2b2de3 100644
--- a/deployment_scripts/puppet/modules/neutron/manifests/configure_fortigate_fwaas.pp
+++ b/deployment_scripts/puppet/modules/neutron/manifests/configure_fortigate_fwaas.pp
@@ -37,9 +37,6 @@ class neutron::configure_fortigate_fwaas {
37 command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf \ 37 command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf \
38--config-file /etc/neutron/plugin.ini --service fwaas upgrade head', 38--config-file /etc/neutron/plugin.ini --service fwaas upgrade head',
39 path => '/usr/bin', 39 path => '/usr/bin',
40 refreshonly => true,
41 tries => 10,
42 try_sleep => 10,
43 require => Package['neutron-fwaas'], 40 require => Package['neutron-fwaas'],
44 notify => Service['neutron-server'], 41 notify => Service['neutron-server'],
45 } 42 }
diff --git a/deployment_scripts/puppet/modules/nova/manifests/configure_nova_for_fortigate.pp b/deployment_scripts/puppet/modules/nova/manifests/configure_nova_for_fortigate.pp
new file mode 100644
index 0000000..2add47f
--- /dev/null
+++ b/deployment_scripts/puppet/modules/nova/manifests/configure_nova_for_fortigate.pp
@@ -0,0 +1,33 @@
1#
2# Copyright 2016 Fortinet Inc.
3#
4# Licensed under the Apache License, Version 2.0 (the "License"); you may
5# not use this file except in compliance with the License. You may obtain
6# a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13# License for the specific language governing permissions and limitations
14# under the License.
15#
16
17class nova::configure_nova_for_fortigate {
18
19 ini_setting { 'nova.conf force config drive':
20 ensure => present,
21 path => '/etc/nova/nova.conf',
22 section => 'DEFAULT',
23 key_val_separator => '=',
24 setting => 'force_config_drive',
25 value => 'True',
26 notify => Service['nova-compute'],
27 }
28
29 service { 'nova-compute':
30 ensure => running,
31 enable => true,
32 }
33}
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 7e41de3..a325f2a 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -28,6 +28,17 @@
28 puppet_manifest: puppet/manifests/configure-fortigate-fwaas.pp 28 puppet_manifest: puppet/manifests/configure-fortigate-fwaas.pp
29 puppet_modules: puppet/modules:/etc/puppet/modules 29 puppet_modules: puppet/modules:/etc/puppet/modules
30 timeout: 360 30 timeout: 360
31
32- id: configure-fortigate-nova
33 type: puppet
34 role: ['compute']
35 requires: [post_deployment_start]
36 required_for: [post_deployment_end]
37 parameters:
38 puppet_manifest: puppet/manifests/configure-fortigate-nova.pp
39 puppet_modules: puppet/modules:/etc/puppet/modules
40 timeout: 360
41
31#- id: fuel-plugin-fortinet-post-deployment-sh 42#- id: fuel-plugin-fortinet-post-deployment-sh
32# version: 2.0.0 43# version: 2.0.0
33# type: shell 44# type: shell