Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1122 from CiscoCloud/docs/0.6-1.0
Browse files Browse the repository at this point in the history
change 0.6 references to 1.0
  • Loading branch information
ryane committed Feb 16, 2016
2 parents 2d6ecb7 + 580a77f commit 1869a94
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

0.6.0 (February 5, 2016)
1.0.0 (February 16, 2016)
-------------------------

Features and Improvements
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
# built documents.
#
# The short X.Y version.
version = '0.6'
version = '1.0'
# The full version, including alpha/beta/rc tags.
release = '0.6'
release = '1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started/aws.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Amazon Web Services
=====================

.. versionadded:: 0.6 multi-az support and terraform modularization
.. versionadded:: 1.0 multi-az support and terraform modularization

As of microservices-infrastructure 0.3 you can bring up Amazon Web Services
environments using Terraform. You can `download Terraform from terraform.io
Expand Down
4 changes: 2 additions & 2 deletions docs/getting_started/gce.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Google Compute Engine
=====================

.. versionadded:: 0.6 multi-zone support and terraform modularization
.. versionadded:: 1.0 multi-zone support and terraform modularization

As of Mantl 0.3 you can bring up Google Compute Engine environments using
Terraform. microservices-infrastructure uses Terraform to provision hosts. You
Expand Down Expand Up @@ -188,4 +188,4 @@ You can set up your DNS records with Terraform:
.. toctree::
:maxdepth: 1

dns.rst
dns.rst
12 changes: 6 additions & 6 deletions docs/upgrading/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Upgrading
Overview
--------

Beginning with Mantl 0.6, our goal is to support a straightforward upgrade path
Beginning with Mantl 1.0, our goal is to support a straightforward upgrade path
from a cluster running a previous release.

However, upgrade support should be considered alpha at this time; it has not
Expand All @@ -21,15 +21,15 @@ second upgrades each node serially. You want the use the rolling upgrade on a
cluster that is already running consul; otherwise, you will likely lose quorum
and destabilize your cluster.

Upgrading from 0.5.1 to 0.6
Upgrading from 0.5.1 to 1.0
---------------------------

If you have a running 0.5.1 cluster, you need to perform the following steps:

Update security.yml
~~~~~~~~~~~~~~~~~~~

Mantl 0.6 requires some additional settings in the ``security.yml`` file that
Mantl 1.0 requires some additional settings in the ``security.yml`` file that
you generated when you built your cluster. To auto-generate the necessary
settings, you simply need to re-run ``security-setup``:

Expand All @@ -49,7 +49,7 @@ For your reference, the following settings have been added:
A note on consul_dns_domain
~~~~~~~~~~~~~~~~~~~~~~~~~~~

Prior to 0.6, the ansible ``consul_dns_domain`` variable was defined in a number
Prior to 1.0, the ansible ``consul_dns_domain`` variable was defined in a number
of different playbooks. It is now included in ``security.yml`` and can be
customized from a single location. This simplifies the configuration and reduces
the likelihood of mistakes. If you are working with a customized
Expand All @@ -67,10 +67,10 @@ Upgrade Distributive, Consul, Mesos, and Marathon
This playbook performs a Distributive upgrade and includes a couple of other
playbooks that perform a rolling upgrade of Consul, Mesos, and Marathon.

Upgrade to Mantl 0.6
Upgrade to Mantl 1.0
~~~~~~~~~~~~~~~~~~~~

At this point, you can now upgrade the rest of the components to 0.6 with the
At this point, you can now upgrade the rest of the components to 1.0 with the
standard provisioning playbook:

.. code-block:: shell
Expand Down
6 changes: 3 additions & 3 deletions roles/consul/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ discovery, specifically using the inbuilt DNS server.
Upgrading
---------

.. versionadded:: 0.6
.. versionadded:: 1.0

Mantl 0.6 includes Consul v0.6.3. If you are running Mantl 0.5.1, you'll need to
Mantl 1.0 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.
cluster to 1.0 in order to ensure a smooth upgrade.

Upgrades from releases prior to Mantl 0.5.1 have not been tested.

Expand Down
4 changes: 2 additions & 2 deletions roles/mesos/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ counts in the cluster.
Upgrading
---------

.. versionadded:: 0.6
.. versionadded:: 1.0

If you are running Mantl 0.5.1, you'll need to run the
``playbooks/upgrade-mesos-marathon.yml`` playbook before reprovisioning your
cluster to 0.6. The packaging format changed in the 0.6 release, this will
cluster to 1.0. The packaging format changed in the 1.0 release, this will
ensure a smooth upgrade.

Upgrades from releases prior to Mantl 0.5.1 have not been tested.
Expand Down
2 changes: 1 addition & 1 deletion terraform/openstack/hosts-floating/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# WARNING: This module has been deprecated as of Mantl 0.6
# WARNING: This module has been deprecated as of Mantl 1.0

variable auth_url { }
variable control_count {}
Expand Down
2 changes: 1 addition & 1 deletion terraform/openstack/hosts/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# WARNING: This module has been deprecated as of Mantl 0.6
# WARNING: This module has been deprecated as of Mantl 1.0

variable auth_url { }
variable control_count {}
Expand Down
2 changes: 1 addition & 1 deletion terraform/openstack/keypair/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# WARNING: This module has been deprecated as of Mantl 0.6
# WARNING: This module has been deprecated as of Mantl 1.0

variable auth_url {}
variable tenant_id {}
Expand Down
2 changes: 1 addition & 1 deletion vagrant/README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Vagrant
=======

.. versionadded:: 0.6
.. versionadded:: 1.0

`Vagrant <https://vagrantup.com/>`_ is used to "Create and configure
lightweight, reproducible, and portable development environments." We use it
Expand Down

0 comments on commit 1869a94

Please sign in to comment.