From d5060e8bacb5107271171636ed470f83edfafc29 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Thu, 14 Dec 2017 13:47:52 -0800
Subject: [PATCH] Add librados2-dev to distro package list

librados2-dev is need to build 'cradox', from gnocchi's ceph
requirements.

The package lists have also been alphabetized.

A linting error in tests was corrected to unblock the gates.

Change-Id: I91b579ff478c02f40fb1573b433735a6a3794e2b
---
 tests/test-gnocchi-functional.yml |  1 +
 vars/redhat-7.yml                 |  5 +++--
 vars/suse-42.yml                  | 11 ++++++-----
 vars/ubuntu-16.04.yml             |  7 ++++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tests/test-gnocchi-functional.yml b/tests/test-gnocchi-functional.yml
index 0afa35e..0fc474e 100644
--- a/tests/test-gnocchi-functional.yml
+++ b/tests/test-gnocchi-functional.yml
@@ -43,6 +43,7 @@
       shell: >
         . /root/openrc && openstack token issue --format yaml | awk '/^id\:/ {print $2}'
       register: get_keystone_token
+      changed_when: false
 
     - name: set token
       set_fact:
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 27f843c..f93ef26 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -16,12 +16,13 @@
 #: Necessary packages
 gnocchi_distro_packages:
   - '@Development Tools'
+  - git
   - httpd
   - httpd-tools
+  - librados2-devel
   - mod_wsgi
-  - git
-  - python-devel
   - postgresql-devel
+  - python-devel
   - which
 
 gnocchi_system_service_name: httpd
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index b955732..ccaeef4 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -16,21 +16,22 @@
 
 # Necessary packages (also includes packages from devel_basis patterns)
 gnocchi_distro_packages:
+  - apache2
+  - apache2-mod_wsgi
+  - apache2-utils
   - autoconf
   - automake
   - binutils
   - cpp
   - gcc
+  - git-core
   - glibc-devel
+  - librados2-devel
   - libtool
   - m4
   - make
-  - apache2
-  - apache2-utils
-  - apache2-mod_wsgi
-  - git-core
-  - python-devel
   - postgresql-devel
+  - python-devel
   - which
 
 gnocchi_system_service_name: apache2
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 4e88031..7738586 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -17,11 +17,12 @@
 gnocchi_distro_packages:
   - apache2
   - apache2-utils
-  - libapache2-mod-wsgi
-  - git
   - build-essential
-  - python-dev
+  - git
+  - libapache2-mod-wsgi
   - libpq-dev
+  - librados-dev
+  - python-dev
 
 gnocchi_system_service_name: apache2