Merge "Add NovaResumeGuestsStateOnHostBoot and NovaResumeGuestsShutdownTimeout"

2018-08-08 12:39:02 +00:00 · 2018-08-08 12:39:02 +00:00 · e7bde70073
commit e7bde70073
parent b59deaefc4 9654393f24
21 changed files with 111 additions and 1 deletions
--- a/environments/hyperconverged-ceph.yaml
+++ b/environments/hyperconverged-ceph.yaml
@ -28,6 +28,7 @@ parameter_defaults:
    - OS::TripleO::Services::NeutronBgpVpnBagpipe
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Kernel
    - OS::TripleO::Services::ComputeNeutronCorePlugin
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -197,6 +197,7 @@ resource_registry:
  OS::TripleO::Services::NovaConductor: docker/services/nova-conductor.yaml
  OS::TripleO::Services::NovaConsoleauth: docker/services/nova-consoleauth.yaml
  OS::TripleO::Services::NovaLibvirt: docker/services/nova-libvirt.yaml
+  OS::TripleO::Services::NovaLibvirtGuests: puppet/services/nova-libvirt-guests.yaml
  OS::TripleO::Services::NovaMetadata: docker/services/nova-metadata.yaml
  OS::TripleO::Services::NovaMigrationTarget: docker/services/nova-migration-target.yaml
  OS::TripleO::Services::NovaPlacement: docker/services/nova-placement.yaml
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@ -165,6 +165,12 @@ parameters:
    description: Used to configure NUMA affinity for all tunneled networks.
    type: comma_delimited_list
    default: []
+  NovaResumeGuestsStateOnHostBoot:
+    default: false
+    description: Whether to start running instance on compute host reboot
+    type: boolean
+    tags:
+      - role_specific

 conditions:
  enable_live_migration_tunnelled:
@ -197,6 +203,7 @@ resources:
              nova::compute::reserved_host_memory: NovaReservedHostMemory
              nova::compute::neutron_physnets_numa_nodes_mapping: NeutronPhysnetNUMANodesMapping
              nova::compute::neutron_tunnel_numa_nodes: NeutronTunnelNUMANodes
+              nova::compute::resume_guests_state_on_host_boot: NovaResumeGuestsStateOnHostBoot
            - values: {get_param: [RoleParameters]}
          - values:
              NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@ -204,7 +211,7 @@ resources:
              NovaReservedHostMemory: {get_param: NovaReservedHostMemory}
              NeutronPhysnetNUMANodesMapping: {get_param: NeutronPhysnetNUMANodesMapping}
              NeutronTunnelNUMANodes: {get_param: NeutronTunnelNUMANodes}
-
+              NovaResumeGuestsStateOnHostBoot: {get_param: NovaResumeGuestsStateOnHostBoot}

 outputs:
  role_data:
--- a/puppet/services/nova-libvirt-guests.yaml
+++ b/puppet/services/nova-libvirt-guests.yaml
@ -0,0 +1,73 @@
+heat_template_version: rocky
+
+description: >
+  Configure libvirt-guests
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  NovaResumeGuestsStateOnHostBoot:
+    default: false
+    description: Whether to start running instance on compute host reboot
+    type: boolean
+    tags:
+      - role_specific
+  NovaResumeGuestsShutdownTimeout:
+    default: 300
+    description: Number of seconds we're willing to wait for a guest to
+                 shut down. If this is 0, then there is no time out (use
+                 with caution, as guests might not respond to a shutdown
+                 request). The default value is 300 seconds (5 minutes).
+    type: string
+    tags:
+      - role_specific
+
+resources:
+  RoleParametersValue:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        map_replace:
+          - map_replace:
+            - tripleo::profile::base::nova::compute::libvirt_guests::enabled: NovaResumeGuestsStateOnHostBoot
+              nova::compute::libvirt_guests::shutdown_timeout: NovaResumeGuestsShutdownTimeout
+            - values: {get_param: [RoleParameters]}
+          - values:
+              NovaResumeGuestsStateOnHostBoot: {get_param: NovaResumeGuestsStateOnHostBoot}
+              NovaResumeGuestsShutdownTimeout: {get_param: NovaResumeGuestsShutdownTimeout}
+
+outputs:
+  role_data:
+    description: Role data for libvirt-guests
+    value:
+      service_name: nova_libvirt_guests
+      config_settings:
+        map_merge:
+          - get_attr: [RoleParametersValue, value]
+      step_config: |
+        include ::tripleo::profile::base::nova::compute::libvirt_guests
--- a/releasenotes/notes/compute-resume-guests-state-on-host-boot-090507db3ffad0d4.yaml
+++ b/releasenotes/notes/compute-resume-guests-state-on-host-boot-090507db3ffad0d4.yaml
@ -0,0 +1,12 @@
+---
+features:
+  - |
+    Added NovaResumeGuestsStateOnHostBoot (true/false) parameter which
+    configures whether or not to start again instances which were running at
+    the time of a compute reboot.
+    This will set the resume_guests_state_on_host_boot parameter in nova.conf
+    and configures and enables libvirt-guests with a dependency to the
+    docker service to shutdown instances before the docker container gets
+    stopped.
+    NovaResumeGuestsShutdownTimeout specifies the number in seconds for an
+    instance to allow to shutdown.
--- a/roles/Compute.yaml
+++ b/roles/Compute.yaml
@ -48,6 +48,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeDVR.yaml
+++ b/roles/ComputeDVR.yaml
@ -39,6 +39,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeHCI.yaml
+++ b/roles/ComputeHCI.yaml
@ -38,6 +38,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeInstanceHA.yaml
+++ b/roles/ComputeInstanceHA.yaml
@ -39,6 +39,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeLiquidio.yaml
+++ b/roles/ComputeLiquidio.yaml
@ -40,6 +40,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::LiquidioCompute
--- a/roles/ComputeOvsDpdk.yaml
+++ b/roles/ComputeOvsDpdk.yaml
@ -39,6 +39,7 @@
    - OS::TripleO::Services::NeutronBgpVpnBagpipe
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeOvsDpdkRT.yaml
+++ b/roles/ComputeOvsDpdkRT.yaml
@ -39,6 +39,7 @@
    - OS::TripleO::Services::NeutronBgpVpnBagpipe
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputePPC64LE.yaml
+++ b/roles/ComputePPC64LE.yaml
@ -39,6 +39,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeRealTime.yaml
+++ b/roles/ComputeRealTime.yaml
@ -46,6 +46,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeSriov.yaml
+++ b/roles/ComputeSriov.yaml
@ -40,6 +40,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/ComputeSriovRT.yaml
+++ b/roles/ComputeSriovRT.yaml
@ -41,6 +41,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/HciCephAll.yaml
+++ b/roles/HciCephAll.yaml
@ -44,6 +44,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/HciCephFile.yaml
+++ b/roles/HciCephFile.yaml
@ -40,6 +40,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/HciCephMon.yaml
+++ b/roles/HciCephMon.yaml
@ -41,6 +41,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles/HciCephObject.yaml
+++ b/roles/HciCephObject.yaml
@ -40,6 +40,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -233,6 +233,7 @@
    - OS::TripleO::Services::NeutronVppAgent
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
    - OS::TripleO::Services::NovaMigrationTarget
    - OS::TripleO::Services::Ntp
    - OS::TripleO::Services::ContainersLogrotateCrond