Browse Source

set force config drive in nova conf

changes/90/483090/1
Jerry Zhao 3 years ago
parent
commit
e4f07beb3e

+ 18
- 0
deployment_scripts/puppet/manifests/configure-fortigate-nova.pp View File

@@ -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
+#
16
+notice('MODULAR: fortinet configure_nova_for_fortigate')
17
+include nova::configure_nova_for_fortigate
18
+

+ 0
- 3
deployment_scripts/puppet/modules/neutron/manifests/configure_fortigate_fwaas.pp View File

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

+ 33
- 0
deployment_scripts/puppet/modules/nova/manifests/configure_nova_for_fortigate.pp View File

@@ -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
+
17
+class 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
+}

+ 11
- 0
deployment_tasks.yaml View File

@@ -28,6 +28,17 @@
28 28
     puppet_manifest: puppet/manifests/configure-fortigate-fwaas.pp
29 29
     puppet_modules: puppet/modules:/etc/puppet/modules
30 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 42
 #- id: fuel-plugin-fortinet-post-deployment-sh
32 43
 #  version: 2.0.0
33 44
 #  type: shell

Loading…
Cancel
Save