From d2ab68b7f22eab8c8517d48bcc39f3ed74fc6c76 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Wed, 28 Jun 2017 15:51:00 -0500
Subject: [PATCH] Correct the list of supported OS versions

This patch corrects the list of suppored OS versions and puts
them in alphabetical order. It also updates the list of platforms
in meta/main.yml.

Change-Id: I6ba6713997c08a21c39e533047849878e710c485
---
 README.md            | 10 +++++-----
 doc/source/faq.rst   | 10 ++++++----
 doc/source/index.rst | 12 ++++++------
 meta/main.yml        | 18 ++++++++++++------
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 49827a86..3567c2d5 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@ from the [Security Technical Implementation Guide (STIG)](http://iase.disa.mil/s
 to systems running the following distributions:
 
 * CentOS 7
-* Debian Jessie *(experimental)*
-* Fedora 25 *(experimental)*
+* Debian Jessie
+* Fedora 25
+* openSUSE Leap 42.2 and 42.3
+* Red Hat Enterprise Linux 7
+* SUSE Linux Enterprise 12 (*experimental*)
 * Ubuntu 14.04 *(deprecated)*
 * Ubuntu 16.04
-* Red Hat Enterprise Linux 7
-* openSUSE Leap 42.2 and 42.3
-* SUSE Linux Enterprise 12 (*experimental*)
 
 For more details, review the
 [ansible-hardening documentation](http://docs.openstack.org/developer/ansible-hardening/).
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index ec86ef33..8f41481c 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -43,12 +43,14 @@ Which systems are covered?
 The ansible-hardening role provides security hardening for physical
 servers running the following Linux distributions:
 
-* Ubuntu 14.04
-* Ubuntu 16.04
 * CentOS 7
-* Red Hat Enterprise Linux 7
+* Debian 8 Jessie
+* Fedora 25
 * openSUSE Leap 42.2 and 42.3
-* SUSE Linux Enterprise 12 (experimental)
+* Red Hat Enterprise Linux 7 *(partial automated test coverage)*
+* SUSE Linux Enterprise 12 (*experimental*)
+* Ubuntu 14.04 Trusty *(Deprecated)*
+* Ubuntu 16.04 Xenial
 
 The OpenStack gating system tests the role against each of these distributions
 regularly except for Red Hat Enterprise Linux 7, since it is a non-free
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 0742b031..fc1b5778 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -88,12 +88,14 @@ Pike
 
 * **Supported Operating Systems:**
 
+  * CentOS 7
+  * Debian 8 Jessie
+  * Fedora 25
+  * openSUSE Leap 42.2 and 42.3
+  * Red Hat Enterprise Linux 7 *(partial automated test coverage)*
+  * SUSE Linux Enterprise 12 (*experimental*)
   * Ubuntu 14.04 Trusty *(Deprecated)*
   * Ubuntu 16.04 Xenial
-  * CentOS 7
-  * Red Hat Enterprise Linux 7 *(partial automated test coverage)*
-  * openSUSE Leap 42.2 and 42.3
-  * SUSE Linux Enterprise 12 (*experimental*)
 
 * **Documentation:**
 
@@ -109,8 +111,6 @@ Ocata
 * **Supported Operating Systems:**
 
   * CentOS 7
-  * Debian Jessie *(experimental)*
-  * Fedora 25 *(experimental)*
   * Red Hat Enterprise Linux 7 *(partial automated test coverage)*
   * Ubuntu 14.04 Trusty *(Deprecated)*
   * Ubuntu 16.04 Xenial
diff --git a/meta/main.yml b/meta/main.yml
index c37e8ef7..17e086dc 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -6,18 +6,24 @@ galaxy_info:
   license: Apache
   min_ansible_version: 2.3
   platforms:
+  - name: Debian
+    versions:
+      - jessie
+  - name: Fedora
+    versions:
+      - 25
   - name: EL
     versions:
-    - 7
+      - 7
   - name: Ubuntu
     versions:
-    - trusty
-    - xenial
+      - trusty
+      - xenial
   - name: opensuse
     versions:
-    - 42.1
-    - 42.2
-    - 42.3
+      - 42.1
+      - 42.2
+      - 42.3
   categories:
   - cloud
   - security