From 49b93b8bd793bd8859cee21587228d9da9200f2d Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 21 Jun 2016 11:34:26 +0100
Subject: [PATCH] Add interfaces, layers and configuration for HA support

---
 config.yaml   | 20 ++++++++++++++++++++
 layer.yaml    |  4 +++-
 metadata.yaml |  6 ++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/config.yaml b/config.yaml
index fc2630b..f068590 100644
--- a/config.yaml
+++ b/config.yaml
@@ -63,3 +63,23 @@ options:
     description: |
        Connect timeout configuration in ms for haproxy, used in HA
        configurations.
+  vip:
+    type: string
+    default:
+    description: |
+      Virtual IP(s) to use to front API services in HA configuration.
+
+      If multiple networks are being used, a VIP should be provided for each
+      network, separated by spaces.
+  vip_iface:
+    type: string
+    default: eth0
+    description: |
+      Default network interface to use for HA vip when it cannot be
+      automatically determined.
+  vip_cidr:
+    type: int
+    default: 24
+    description: |
+      Default CIDR netmask to use for HA vip when it cannot be automatically
+      determined.
diff --git a/layer.yaml b/layer.yaml
index 05e1720..dd35069 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1 +1,3 @@
-includes: ['layer:openstack-principle', 'interface:mysql-shared', 'interface:rabbitmq', 'interface:keystone']
+includes: ['layer:openstack-principle', 'interface:mysql-shared',
+           'interface:rabbitmq', 'interface:keystone',
+           'interface:hacluster', 'interface:openstack-ha']
diff --git a/metadata.yaml b/metadata.yaml
index 1922154..7aaff3f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -12,3 +12,9 @@ requires:
     interface: rabbitmq
   identity-service:
     interface: keystone
+  ha:
+    interface: hacluster
+    scope: container
+peers:
+  cluster:
+    interface: openstack-ha