Merge "Add Instance HA support"

environments/compute-instanceha.yaml

@@ -0,0 +1,9 @@
+# An environment which enables instance HA
+# Needs to be combined with environments/puppet-pacemaker.yaml
+# The ComputeInstanceHA *and* PacemakerRemote services need to be added
+# to your Compute role
+resource_registry:
+  OS::TripleO::Services::ComputeInstanceHA: ../puppet/services/pacemaker/compute-instanceha.yaml
+
+parameter_defaults:
+  EnableInstanceHA: true

overcloud-resource-registry-puppet.j2.yaml

@@ -308,6 +308,7 @@ resource_registry:
   OS::TripleO::Services::SkydiveAgent: OS::Heat::None
   OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None
   OS::TripleO::Services::LoginDefs: OS::Heat::None
+  OS::TripleO::Services::ComputeInstanceHA: OS::Heat::None
 
   # Logging
   OS::TripleO::Services::Logging::BarbicanApi: docker/services/logging/files/barbican-api.yaml

puppet/services/keystone.yaml

@@ -397,6 +397,12 @@ outputs:
           keystone::db::mysql::allowed_hosts:
             - '%'
             - "%{hiera('mysql_bind_host')}"
+        pacemaker:
+          keystone::endpoint::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
+          keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+          keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+          keystone::endpoint::region: {get_param: KeystoneRegion}
+          keystone::admin_password: {get_param: AdminPassword}
         horizon:
           if:
           - keystone_ldap_domain_enabled

puppet/services/pacemaker/compute-instanceha.yaml

@@ -0,0 +1,48 @@
+heat_template_version: queens
+
+description: >
+  OpenStack Compute InstanceHA services configured with Puppet
+
+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
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  EnableInstanceHA:
+    default: false
+    description: Whether to enable an Instance Ha configurarion or not.
+                 This setup requires the Compute role to have the
+                 PacemakerRemote service added to it.
+    type: boolean
+
+outputs:
+  role_data:
+    description: Role data for Compute InstanceHA service.
+    value:
+      service_name: compute_instanceha
+      global_config_settings:
+        tripleo::instanceha: {get_param: EnableInstanceHA}
+      step_config: |
+        include ::tripleo::profile::pacemaker::compute_instanceha

releasenotes/notes/instance-ha-18e59ab0e9697ef3.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Support for Instance HA is added. This configures the control plane to do
+    fence for a compute node that dies, then a nova --force-down and finally
+    and evacuation for the vms that were running on the failed node.