Browse Source

Merge "Add NovaResumeGuestsStateOnHostBoot and NovaResumeGuestsShutdownTimeout" into stable/queens

tags/8.4.1
Zuul 1 month ago
parent
commit
8485b41af9

+ 1
- 0
environments/hyperconverged-ceph.yaml View File

@@ -28,6 +28,7 @@ parameter_defaults:
28 28
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
29 29
     - OS::TripleO::Services::NovaCompute
30 30
     - OS::TripleO::Services::NovaLibvirt
31
+    - OS::TripleO::Services::NovaLibvirtGuests
31 32
     - OS::TripleO::Services::NovaMigrationTarget
32 33
     - OS::TripleO::Services::Kernel
33 34
     - OS::TripleO::Services::ComputeNeutronCorePlugin

+ 1
- 0
overcloud-resource-registry-puppet.j2.yaml View File

@@ -213,6 +213,7 @@ resource_registry:
213 213
   OS::TripleO::Services::NovaConductor: docker/services/nova-conductor.yaml
214 214
   OS::TripleO::Services::NovaConsoleauth: docker/services/nova-consoleauth.yaml
215 215
   OS::TripleO::Services::NovaLibvirt: docker/services/nova-libvirt.yaml
216
+  OS::TripleO::Services::NovaLibvirtGuests: puppet/services/nova-libvirt-guests.yaml
216 217
   OS::TripleO::Services::NovaMetadata: docker/services/nova-metadata.yaml
217 218
   OS::TripleO::Services::NovaMigrationTarget: docker/services/nova-migration-target.yaml
218 219
   OS::TripleO::Services::NovaPlacement: docker/services/nova-placement.yaml

+ 8
- 0
puppet/services/nova-compute.yaml View File

@@ -203,6 +203,12 @@ parameters:
203 203
     type: number
204 204
     tags:
205 205
       - role_specific
206
+  NovaResumeGuestsStateOnHostBoot:
207
+    default: false
208
+    description: Whether to start running instance on compute host reboot
209
+    type: boolean
210
+    tags:
211
+      - role_specific
206 212
 
207 213
 conditions:
208 214
   enable_live_migration_tunnelled:
@@ -245,6 +251,7 @@ resources:
245 251
               nfs_options: NovaNfsOptions
246 252
               nfs_vers: NovaNfsVersion
247 253
               nova::compute::libvirt::mem_stats_period_seconds: NovaLibvirtMemStatsPeriodSeconds
254
+              nova::compute::resume_guests_state_on_host_boot: NovaResumeGuestsStateOnHostBoot
248 255
             - values: {get_param: [RoleParameters]}
249 256
           - values:
250 257
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@@ -258,6 +265,7 @@ resources:
258 265
               NovaNfsOptions: {get_param: NovaNfsOptions}
259 266
               NovaNfsVersion: {get_param: NovaNfsVersion}
260 267
               NovaLibvirtMemStatsPeriodSeconds: {get_param: NovaLibvirtMemStatsPeriodSeconds}
268
+              NovaResumeGuestsStateOnHostBoot: {get_param: NovaResumeGuestsStateOnHostBoot}
261 269
 
262 270
 outputs:
263 271
   role_data:

+ 73
- 0
puppet/services/nova-libvirt-guests.yaml View File

@@ -0,0 +1,73 @@
1
+heat_template_version: queens
2
+
3
+description: >
4
+  Configure libvirt-guests
5
+
6
+parameters:
7
+  ServiceData:
8
+    default: {}
9
+    description: Dictionary packing service data
10
+    type: json
11
+  ServiceNetMap:
12
+    default: {}
13
+    description: Mapping of service_name -> network name. Typically set
14
+                 via parameter_defaults in the resource registry.  This
15
+                 mapping overrides those in ServiceNetMapDefaults.
16
+    type: json
17
+  DefaultPasswords:
18
+    default: {}
19
+    type: json
20
+  EndpointMap:
21
+    default: {}
22
+    description: Mapping of service endpoint -> protocol. Typically set
23
+                 via parameter_defaults in the resource registry.
24
+    type: json
25
+  RoleName:
26
+    default: ''
27
+    description: Role name on which the service is applied
28
+    type: string
29
+  RoleParameters:
30
+    default: {}
31
+    description: Parameters specific to the role
32
+    type: json
33
+  NovaResumeGuestsStateOnHostBoot:
34
+    default: false
35
+    description: Whether to start running instance on compute host reboot
36
+    type: boolean
37
+    tags:
38
+      - role_specific
39
+  NovaResumeGuestsShutdownTimeout:
40
+    default: 300
41
+    description: Number of seconds we're willing to wait for a guest to
42
+                 shut down. If this is 0, then there is no time out (use
43
+                 with caution, as guests might not respond to a shutdown
44
+                 request). The default value is 300 seconds (5 minutes).
45
+    type: string
46
+    tags:
47
+      - role_specific
48
+
49
+resources:
50
+  RoleParametersValue:
51
+    type: OS::Heat::Value
52
+    properties:
53
+      type: json
54
+      value:
55
+        map_replace:
56
+          - map_replace:
57
+            - tripleo::profile::base::nova::compute::libvirt_guests::enabled: NovaResumeGuestsStateOnHostBoot
58
+              nova::compute::libvirt_guests::shutdown_timeout: NovaResumeGuestsShutdownTimeout
59
+            - values: {get_param: [RoleParameters]}
60
+          - values:
61
+              NovaResumeGuestsStateOnHostBoot: {get_param: NovaResumeGuestsStateOnHostBoot}
62
+              NovaResumeGuestsShutdownTimeout: {get_param: NovaResumeGuestsShutdownTimeout}
63
+
64
+outputs:
65
+  role_data:
66
+    description: Role data for libvirt-guests
67
+    value:
68
+      service_name: nova_libvirt_guests
69
+      config_settings:
70
+        map_merge:
71
+          - get_attr: [RoleParametersValue, value]
72
+      step_config: |
73
+        include ::tripleo::profile::base::nova::compute::libvirt_guests

+ 12
- 0
releasenotes/notes/compute-resume-guests-state-on-host-boot-090507db3ffad0d4.yaml View File

@@ -0,0 +1,12 @@
1
+---
2
+features:
3
+  - |
4
+    Added NovaResumeGuestsStateOnHostBoot (true/false) parameter which
5
+    configures whether or not to start again instances which were running at
6
+    the time of a compute reboot.
7
+    This will set the resume_guests_state_on_host_boot parameter in nova.conf
8
+    and configures and enables libvirt-guests with a dependency to the
9
+    docker service to shutdown instances before the docker container gets
10
+    stopped.
11
+    NovaResumeGuestsShutdownTimeout specifies the number in seconds for an
12
+    instance to allow to shutdown.

+ 1
- 0
roles/Compute.yaml View File

@@ -50,6 +50,7 @@
50 50
     - OS::TripleO::Services::NeutronVppAgent
51 51
     - OS::TripleO::Services::NovaCompute
52 52
     - OS::TripleO::Services::NovaLibvirt
53
+    - OS::TripleO::Services::NovaLibvirtGuests
53 54
     - OS::TripleO::Services::NovaMigrationTarget
54 55
     - OS::TripleO::Services::Ntp
55 56
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeDVR.yaml View File

@@ -40,6 +40,7 @@
40 40
     - OS::TripleO::Services::NeutronVppAgent
41 41
     - OS::TripleO::Services::NovaCompute
42 42
     - OS::TripleO::Services::NovaLibvirt
43
+    - OS::TripleO::Services::NovaLibvirtGuests
43 44
     - OS::TripleO::Services::NovaMigrationTarget
44 45
     - OS::TripleO::Services::Ntp
45 46
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeHCI.yaml View File

@@ -41,6 +41,7 @@
41 41
     - OS::TripleO::Services::NeutronVppAgent
42 42
     - OS::TripleO::Services::NovaCompute
43 43
     - OS::TripleO::Services::NovaLibvirt
44
+    - OS::TripleO::Services::NovaLibvirtGuests
44 45
     - OS::TripleO::Services::NovaMigrationTarget
45 46
     - OS::TripleO::Services::Ntp
46 47
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeHCIOvsDpdk.yaml View File

@@ -43,6 +43,7 @@
43 43
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
44 44
     - OS::TripleO::Services::NovaCompute
45 45
     - OS::TripleO::Services::NovaLibvirt
46
+    - OS::TripleO::Services::NovaLibvirtGuests
46 47
     - OS::TripleO::Services::NovaMigrationTarget
47 48
     - OS::TripleO::Services::Ntp
48 49
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeInstanceHA.yaml View File

@@ -41,6 +41,7 @@
41 41
     - OS::TripleO::Services::NeutronVppAgent
42 42
     - OS::TripleO::Services::NovaCompute
43 43
     - OS::TripleO::Services::NovaLibvirt
44
+    - OS::TripleO::Services::NovaLibvirtGuests
44 45
     - OS::TripleO::Services::NovaMigrationTarget
45 46
     - OS::TripleO::Services::Ntp
46 47
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeLiquidio.yaml View File

@@ -41,6 +41,7 @@
41 41
     - OS::TripleO::Services::NeutronVppAgent
42 42
     - OS::TripleO::Services::NovaCompute
43 43
     - OS::TripleO::Services::NovaLibvirt
44
+    - OS::TripleO::Services::NovaLibvirtGuests
44 45
     - OS::TripleO::Services::NovaMigrationTarget
45 46
     - OS::TripleO::Services::Ntp
46 47
     - OS::TripleO::Services::LiquidioCompute

+ 1
- 0
roles/ComputeOvsDpdk.yaml View File

@@ -43,6 +43,7 @@
43 43
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
44 44
     - OS::TripleO::Services::NovaCompute
45 45
     - OS::TripleO::Services::NovaLibvirt
46
+    - OS::TripleO::Services::NovaLibvirtGuests
46 47
     - OS::TripleO::Services::NovaMigrationTarget
47 48
     - OS::TripleO::Services::Ntp
48 49
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeOvsDpdkRT.yaml View File

@@ -44,6 +44,7 @@
44 44
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
45 45
     - OS::TripleO::Services::NovaCompute
46 46
     - OS::TripleO::Services::NovaLibvirt
47
+    - OS::TripleO::Services::NovaLibvirtGuests
47 48
     - OS::TripleO::Services::NovaMigrationTarget
48 49
     - OS::TripleO::Services::Ntp
49 50
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeOvsDpdkSriov.yaml View File

@@ -42,6 +42,7 @@
42 42
     - OS::TripleO::Services::NeutronSriovHostConfig
43 43
     - OS::TripleO::Services::NovaCompute
44 44
     - OS::TripleO::Services::NovaLibvirt
45
+    - OS::TripleO::Services::NovaLibvirtGuests
45 46
     - OS::TripleO::Services::NovaMigrationTarget
46 47
     - OS::TripleO::Services::Ntp
47 48
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeRealTime.yaml View File

@@ -49,6 +49,7 @@
49 49
     - OS::TripleO::Services::NeutronVppAgent
50 50
     - OS::TripleO::Services::NovaCompute
51 51
     - OS::TripleO::Services::NovaLibvirt
52
+    - OS::TripleO::Services::NovaLibvirtGuests
52 53
     - OS::TripleO::Services::NovaMigrationTarget
53 54
     - OS::TripleO::Services::Ntp
54 55
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeSriov.yaml View File

@@ -42,6 +42,7 @@
42 42
     - OS::TripleO::Services::NeutronVppAgent
43 43
     - OS::TripleO::Services::NovaCompute
44 44
     - OS::TripleO::Services::NovaLibvirt
45
+    - OS::TripleO::Services::NovaLibvirtGuests
45 46
     - OS::TripleO::Services::NovaMigrationTarget
46 47
     - OS::TripleO::Services::Ntp
47 48
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/ComputeSriovRT.yaml View File

@@ -44,6 +44,7 @@
44 44
     - OS::TripleO::Services::NeutronVppAgent
45 45
     - OS::TripleO::Services::NovaCompute
46 46
     - OS::TripleO::Services::NovaLibvirt
47
+    - OS::TripleO::Services::NovaLibvirtGuests
47 48
     - OS::TripleO::Services::NovaMigrationTarget
48 49
     - OS::TripleO::Services::Ntp
49 50
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/HciCephAll.yaml View File

@@ -47,6 +47,7 @@
47 47
     - OS::TripleO::Services::NeutronVppAgent
48 48
     - OS::TripleO::Services::NovaCompute
49 49
     - OS::TripleO::Services::NovaLibvirt
50
+    - OS::TripleO::Services::NovaLibvirtGuests
50 51
     - OS::TripleO::Services::NovaMigrationTarget
51 52
     - OS::TripleO::Services::Ntp
52 53
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/HciCephFile.yaml View File

@@ -43,6 +43,7 @@
43 43
     - OS::TripleO::Services::NeutronVppAgent
44 44
     - OS::TripleO::Services::NovaCompute
45 45
     - OS::TripleO::Services::NovaLibvirt
46
+    - OS::TripleO::Services::NovaLibvirtGuests
46 47
     - OS::TripleO::Services::NovaMigrationTarget
47 48
     - OS::TripleO::Services::Ntp
48 49
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/HciCephMon.yaml View File

@@ -44,6 +44,7 @@
44 44
     - OS::TripleO::Services::NeutronVppAgent
45 45
     - OS::TripleO::Services::NovaCompute
46 46
     - OS::TripleO::Services::NovaLibvirt
47
+    - OS::TripleO::Services::NovaLibvirtGuests
47 48
     - OS::TripleO::Services::NovaMigrationTarget
48 49
     - OS::TripleO::Services::Ntp
49 50
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/HciCephObject.yaml View File

@@ -43,6 +43,7 @@
43 43
     - OS::TripleO::Services::NeutronVppAgent
44 44
     - OS::TripleO::Services::NovaCompute
45 45
     - OS::TripleO::Services::NovaLibvirt
46
+    - OS::TripleO::Services::NovaLibvirtGuests
46 47
     - OS::TripleO::Services::NovaMigrationTarget
47 48
     - OS::TripleO::Services::Ntp
48 49
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles_data.yaml View File

@@ -229,6 +229,7 @@
229 229
     - OS::TripleO::Services::NeutronVppAgent
230 230
     - OS::TripleO::Services::NovaCompute
231 231
     - OS::TripleO::Services::NovaLibvirt
232
+    - OS::TripleO::Services::NovaLibvirtGuests
232 233
     - OS::TripleO::Services::NovaMigrationTarget
233 234
     - OS::TripleO::Services::Ntp
234 235
     - OS::TripleO::Services::ContainersLogrotateCrond

Loading…
Cancel
Save