From 9b964a6687d235b2eeec5debee83680b9edcdbbf Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@hpe.com>
Date: Tue, 22 Sep 2015 15:39:50 +0100
Subject: [PATCH] Add Kilo upgrade nodes

Change-Id: If34909ddbec624ecff96d6649e40612f067bc46e
Closes-Bug: 1494388
(cherry picked from b153f662980bb51a479780ad0f5e6d285cf53f76)
---
 doc/source/index.rst        | 10 ++++++++++
 doc/source/upgrade/kilo.rst | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 doc/source/upgrade/kilo.rst

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 60edfae63..9b686faaa 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -23,6 +23,16 @@ Install Guides
 
     install/*
 
+Upgrade Guides
+==============
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    upgrade/*
+
+
 How To Guides
 =============
 
diff --git a/doc/source/upgrade/kilo.rst b/doc/source/upgrade/kilo.rst
new file mode 100644
index 000000000..7925d96f0
--- /dev/null
+++ b/doc/source/upgrade/kilo.rst
@@ -0,0 +1,40 @@
+..
+    Copyright 2015 Hewlett-Packard Development Company, L.P.
+
+    Licensed under the Apache License, Version 2.0 (the "License"); you may
+    not use this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and limitations
+    under the License.
+
+***************************
+Upgrading to Kilo form Juno
+***************************
+
+.. note::
+   This doc section is a work in progress, for now, we have some smaller
+   hints and tips for watchout for during the upgrade.
+
+Tips and Tricks
+===============
+
+1. Two new Designate services
+
+Two new Designate services were added in Kilo, designate-pool-manager and
+designate-mdns. Please ensure to configure and enable these services as
+part of the upgrade.
+
+
+2. Post-Migration, existing DNS domains hosted by PowerDNS must have their
+"masters" column manually populated with the list of designate-mdns ip and
+port pairs, and their type switched to SECONDARY. For example:
+
+.. code-block:: ruby
+
+   UPDATE powerdns.domains SET type = "SECONDARY", masters = "192.0.2.1:5354,192.0.2.2:5354" WHERE masters IS NULL;