# -*- coding: utf-8 -*-
#
# Microservices Infrastructure documentation build configuration file, created by
# sphinx-quickstart on Wed Feb  4 06:59:14 2015.
#
# This file is execfile()d with the current directory set to its
# containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
#
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys
import os

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))

# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
    'sphinx.ext.autodoc',
    'sphinx.ext.intersphinx',
    'sphinx.ext.viewcode',
    'sphinx.ext.todo',
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

# The suffix of source filenames.
source_suffix = '.rst'

# The encoding of source files.
#source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'index'

# General information about the project.
project = u'Microservices Infrastructure'
copyright = u'2015, Cisco Systems, Incorporated'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.3'
# The full version, including alpha/beta/rc tags.
release = '0.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['_build']

# The reST default role (used for this markup: `text`) to use for all
# documents.
#default_role = None

# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True

# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True

# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'

# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []

# If true, keep warnings as "system message" paragraphs in the built documents.
#keep_warnings = False


# -- Options for HTML output ----------------------------------------------

import alabaster

# The theme to use for HTML and HTML Help pages.  See the documentation for
# a list of builtin themes.
html_theme = 'alabaster'

# Theme options are theme-specific and customize the look and feel of a theme
# further.  For a list of options available for each theme, see the
# documentation.
extensions += ['alabaster']
html_theme_options = {
    'github_user': 'ciscocloud',
    'github_repo': 'microservices-infrastructure',
    'logo': 'cisco.png',
    'logo_name': True,
}

# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = [alabaster.get_path()]

# The name for this set of Sphinx documents.  If None, it defaults to
# "<project> v<release> documentation".
#html_title = None

# A shorter title for the navigation bar.  Default is the same as html_title.
#html_short_title = None

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
# html_logo = None

# The name of an image file (within the static path) to use as favicon of the
# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
#html_extra_path = []

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
html_last_updated_fmt = '%b %d, %Y'

# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True

# Custom sidebar templates, maps document names to template names.
html_sidebars = {
    '**': [
        'about.html', 'navigation.html', 'searchbox.html'
    ]
}

# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}

# If false, no module index is generated.
html_domain_indices = True

# If false, no index is generated.
html_use_index = True

# If true, the index is split into individual pages for each letter.
#html_split_index = False

# If true, links to the reST sources are added to the pages.
html_show_sourcelink = True

# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
html_show_sphinx = False

# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
#html_show_copyright = True

# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it.  The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''

# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'MicroservicesInfrastructuredoc'


# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#'preamble': '',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
#  author, documentclass [howto, manual, or own class]).
latex_documents = [
  ('index', 'MicroservicesInfrastructure.tex', u'Microservices Infrastructure Documentation',
   u'Cisco Systems, Incorporated', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None

# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
#latex_use_parts = False

# If true, show page references after internal links.
#latex_show_pagerefs = False

# If true, show URL addresses after external links.
latex_show_urls = 'footnote'

# Documents to append as an appendix to all manuals.
#latex_appendices = []

# If false, no module index is generated.
#latex_domain_indices = True


# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
    ('index', 'microservicesinfrastructure', u'Microservices Infrastructure Documentation',
     [u'Cisco Systems, Incorporated'], 1)
]

# If true, show URL addresses after external links.
#man_show_urls = False


# -- Options for Texinfo output -------------------------------------------

# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
#  dir menu entry, description, category)
texinfo_documents = [
  ('index', 'MicroservicesInfrastructure', u'Microservices Infrastructure Documentation',
   u'Cisco Systems, Incorporated', 'MicroservicesInfrastructure', 'One line description of project.',
   'Miscellaneous'),
]

# Documents to append as an appendix to all manuals.
#texinfo_appendices = []

# If false, no module index is generated.
#texinfo_domain_indices = True

# How to display URL addresses: 'footnote', 'no', or 'inline'.
#texinfo_show_urls = 'footnote'

# If true, do not generate a @detailmenu in the "Top" node's menu.
#texinfo_no_detailmenu = False


# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
    'python': ('http://docs.python.org/', None),
    'ansible': ('http://docs.ansible.com/', None),
}

# -- Options for todo ext ------------------------------------------------
todo_include_todos = os.getenv('INCLUDE_TODOS', '0') == '1' or version != release

# -- setup ---------------------------------------------------------------
def setup(app):
    from sphinx.util.texescape import tex_replacements
    tex_replacements.extend([
        (u'☐', u'[ ]'),
        (u'☑', u'[x]'),
    ])

docs/conf.py
# -*- coding: utf-8 -*-
#
# Microservices Infrastructure documentation build configuration file, created by
# sphinx-quickstart on Wed Feb  4 06:59:14 2015.
#
# This file is execfile()d with the current directory set to its
# containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
#
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys
import os

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))

# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
    'sphinx.ext.autodoc',
    'sphinx.ext.intersphinx',
    'sphinx.ext.viewcode',
    'sphinx.ext.todo',
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

# The suffix of source filenames.
source_suffix = '.rst'

# The encoding of source files.
#source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'index'

# General information about the project.
project = u'Microservices Infrastructure'
copyright = u'2015, Cisco Systems, Incorporated'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.6'
# The full version, including alpha/beta/rc tags.
release = '0.6'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['_build']

# The reST default role (used for this markup: `text`) to use for all
# documents.
#default_role = None

# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True

# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True

# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'

# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []

# If true, keep warnings as "system message" paragraphs in the built documents.
#keep_warnings = False


# -- Options for HTML output ----------------------------------------------

import alabaster

# The theme to use for HTML and HTML Help pages.  See the documentation for
# a list of builtin themes.
html_theme = 'alabaster'

# Theme options are theme-specific and customize the look and feel of a theme
# further.  For a list of options available for each theme, see the
# documentation.
extensions += ['alabaster']
html_theme_options = {
    'github_user': 'ciscocloud',
    'github_repo': 'microservices-infrastructure',
    'logo': 'cisco.png',
    'logo_name': True,
}

# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = [alabaster.get_path()]

# The name for this set of Sphinx documents.  If None, it defaults to
# "<project> v<release> documentation".
#html_title = None

# A shorter title for the navigation bar.  Default is the same as html_title.
#html_short_title = None

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
# html_logo = None

# The name of an image file (within the static path) to use as favicon of the
# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
#html_extra_path = []

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
html_last_updated_fmt = '%b %d, %Y'

# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True

# Custom sidebar templates, maps document names to template names.
html_sidebars = {
    '**': [
        'about.html', 'navigation.html', 'searchbox.html'
    ]
}

# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}

# If false, no module index is generated.
html_domain_indices = True

# If false, no index is generated.
html_use_index = True

# If true, the index is split into individual pages for each letter.
#html_split_index = False

# If true, links to the reST sources are added to the pages.
html_show_sourcelink = True

# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
html_show_sphinx = False

# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
#html_show_copyright = True

# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it.  The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''

# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'MicroservicesInfrastructuredoc'


# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#'preamble': '',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
#  author, documentclass [howto, manual, or own class]).
latex_documents = [
  ('index', 'MicroservicesInfrastructure.tex', u'Microservices Infrastructure Documentation',
   u'Cisco Systems, Incorporated', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None

# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
#latex_use_parts = False

# If true, show page references after internal links.
#latex_show_pagerefs = False

# If true, show URL addresses after external links.
latex_show_urls = 'footnote'

# Documents to append as an appendix to all manuals.
#latex_appendices = []

# If false, no module index is generated.
#latex_domain_indices = True


# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
    ('index', 'microservicesinfrastructure', u'Microservices Infrastructure Documentation',
     [u'Cisco Systems, Incorporated'], 1)
]

# If true, show URL addresses after external links.
#man_show_urls = False


# -- Options for Texinfo output -------------------------------------------

# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
#  dir menu entry, description, category)
texinfo_documents = [
  ('index', 'MicroservicesInfrastructure', u'Microservices Infrastructure Documentation',
   u'Cisco Systems, Incorporated', 'MicroservicesInfrastructure', 'One line description of project.',
   'Miscellaneous'),
]

# Documents to append as an appendix to all manuals.
#texinfo_appendices = []

# If false, no module index is generated.
#texinfo_domain_indices = True

# How to display URL addresses: 'footnote', 'no', or 'inline'.
#texinfo_show_urls = 'footnote'

# If true, do not generate a @detailmenu in the "Top" node's menu.
#texinfo_no_detailmenu = False


# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
    'python': ('http://docs.python.org/', None),
    'ansible': ('http://docs.ansible.com/', None),
}

# -- Options for todo ext ------------------------------------------------
todo_include_todos = os.getenv('INCLUDE_TODOS', '0') == '1' or version != release

# -- setup ---------------------------------------------------------------
def setup(app):
    from sphinx.util.texescape import tex_replacements
    tex_replacements.extend([
        (u'☐', u'[ ]'),
        (u'☑', u'[x]'),
    ])

docs/conf.py
diff --git a/docs/conf.py b/docs/conf.py
index 23bb7331e..e93d52d0a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3'
+version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.3'
+release = '0.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/index.rst b/docs/index.rst
index 2b796ca6f..190fbfe40 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -43,6 +43,7 @@ Contents:
    getting_started/index.rst
    components/index.rst
    security/index.rst
+   upgrading/index.rst
    packer.rst
    changelog.rst
    roadmap.rst
diff --git a/docs/upgrading/index.rst b/docs/upgrading/index.rst
new file mode 100644
index 000000000..fd734b9a2
--- /dev/null
+++ b/docs/upgrading/index.rst
@@ -0,0 +1,38 @@
+Upgrading
+=========
+
+Overview
+--------
+
+Starting with Mantl 0.6, our goal is to support a straightforward upgrade path
+from a cluster running a previous release.
+
+Upgrading from 0.5.1 to 0.6
+---------------------------
+
+If you have a running 0.5.1 cluster, you need to perform the following two
+steps:
+
+Upgrade Consul, Mesos, and Marathon
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: shell
+
+  ansible-playbook -e @security.yml playbooks/upgrade-0.5.1.yml
+
+This playbook simply includes a couple of other playbooks that perform a rolling
+upgrade of Consul, Mesos, and Marathon. If you want, you can run the following
+playbooks independently:
+
+* playbooks/upgrade-consul.yml
+* playbooks/upgrade-mesos-marathon.yml
+
+Upgrade to Mantl 0.6
+~~~~~~~~~~~~~~~~~~~~
+
+At this point, you can now upgrade the rest of the components to 0.6 with the
+standard provisioning playbook:
+
+.. code-block:: shell
+
+  ansible-playbook -e @security.yml terraform.yml
diff --git a/playbooks/upgrade-0.5.1.yml b/playbooks/upgrade-0.5.1.yml
new file mode 100644
index 000000000..a0b33f67c
--- /dev/null
+++ b/playbooks/upgrade-0.5.1.yml
@@ -0,0 +1,5 @@
+---
+- include: ./upgrade-consul.yml
+- include: ./upgrade-mesos-marathon.yml
+  vars:
+    consul_dns_domain: consul
diff --git a/playbooks/upgrade-consul.yml b/playbooks/upgrade-consul.yml
new file mode 100644
index 000000000..00f3248cc
--- /dev/null
+++ b/playbooks/upgrade-consul.yml
@@ -0,0 +1,23 @@
+---
+- hosts: all
+  serial: "{{ serial | default(1) }}"
+  tasks:
+    - include_vars: ../roles/consul/defaults/main.yml
+
+    - name: install consul
+      sudo: yes
+      yum:
+        name: "{{ item }}"
+        state: present
+      with_items:
+        - "{{ consul_package }}"
+        - "{{ consul_ui_package }}"
+
+    - name: restart consul
+      sudo: yes
+      service:
+        name: consul
+        state: restarted
+ 
+    - name: wait for leader
+      command: /usr/local/bin/consul-wait-for-leader.sh
diff --git a/roles/consul/README.rst b/roles/consul/README.rst
index 1b9bafa8b..d6ed5b965 100644
--- a/roles/consul/README.rst
+++ b/roles/consul/README.rst
@@ -6,6 +6,17 @@ Consul
 `Consul <https://www.consul.io/>`_ is used in the project to coordinate service
 discovery, specifically using the inbuilt DNS server.
 
+Upgrading
+---------
+
+.. versionadded:: 0.6
+
+Mantl 0.6 includes Consul v0.6.3. If you are running Mantl 0.5.1, you'll need to
+run the ``playbooks/upgrade-consul.yml`` playbook before reprovisioning your
+cluster to 0.6 in order to ensure a smooth upgrade.
+
+Upgrades from releases prior to Mantl 0.5.1 have not been tested.
+
 Variables
 ---------
 
diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml
index bdd965ee6..d0712f0c8 100644
--- a/roles/consul/defaults/main.yml
+++ b/roles/consul/defaults/main.yml
@@ -1,4 +1,7 @@
 ---
+consul_package: https://bintray.com/artifact/download/asteris/mantl-rpm/consul-0.6.3-1.centos.x86_64.rpm
+consul_ui_package: https://bintray.com/artifact/download/asteris/mantl-rpm/consul-ui-0.6.3-1.x86_64.rpm
+consul_cli_package: https://bintray.com/artifact/download/asteris/mantl-rpm/consul-cli-0.1.0-2.x86_64.rpm
 consul_is_server: yes
 consul_dc: dc1
 consul_dc_group: dc={{ consul_dc }}
diff --git a/roles/consul/tasks/main.yml b/roles/consul/tasks/main.yml
index 9c6e18f3b..986b17214 100644
--- a/roles/consul/tasks/main.yml
+++ b/roles/consul/tasks/main.yml
@@ -5,9 +5,9 @@
     name: "{{ item }}"
     state: present
   with_items:
-    - https://bintray.com/artifact/download/asteris/mantl-rpm/consul-0.6.3-1.centos.x86_64.rpm
-    - https://bintray.com/artifact/download/asteris/mantl-rpm/consul-ui-0.6.3-1.x86_64.rpm
-    - https://bintray.com/artifact/download/asteris/mantl-rpm/consul-cli-0.1.0-2.x86_64.rpm
+    - "{{ consul_package }}"
+    - "{{ consul_ui_package }}"
+    - "{{ consul_cli_package }}"
   tags:
     - consul
     - bootstrap

upgrade path from 0.5.1 to 0.6
0.6 will include updated versions of marathon (0.13), mesos (0.25), and consul (0.6.3). We want to support an upgrade of an existing 0.5.1 cluster.
- [x] mesos/marathon: https://github.com/CiscoCloud/microservices-infrastructure/blob/master/playbooks/upgrade-mesos-marathon.yml
- [ ] consul upgrade
- [ ] vault (depending if https://github.com/CiscoCloud/microservices-infrastructure/tree/feature/vault-ssl makes it to this release)
- [ ] document upgrade process

