From 9f02f8b965c4ff84bbb1d6986abf3c0e11a592c7 Mon Sep 17 00:00:00 2001
From: David Moreau Simard <dms@redhat.com>
Date: Thu, 4 Feb 2016 18:07:01 -0500
Subject: [PATCH] Bump RDO packaging and update nova.conf on RedHat systems

This is a stash between 2 patches, that need to land together:

1/ Bump RDO packaging to a very recent Mitaka repo URL so we can have
latest Nova & Gnocchi, that contains some importants changes.
Related-Bug: #1542069
Depends-On: Icf4a4b38fbba4fd2e4a20c7c3ffeacf1cc86085e

2/ Update nova.pp with new parameters for Neutron / Nova communications
Related-Bug: #1542486
Depends-On: I1a99a050ba70399f045930e26e52719bb53a75b3

Change-Id: Idc14417cc09ee4ec58b343e57d67b0bd2efeecf2
---
 manifests/nova.pp  | 24 ++++++++++++++++++++++--
 manifests/repos.pp |  8 ++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/manifests/nova.pp b/manifests/nova.pp
index 70fe7f25e..8d7e15b3a 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -62,8 +62,28 @@ class openstack_integration::nova {
   }
   class { '::nova::scheduler': }
   class { '::nova::vncproxy': }
-  class { '::nova::network::neutron':
-    neutron_password => 'a_big_secret',
+
+  # Nova versions are different on Ubuntu & RedHat systems.
+  # RedHat packaging is more recent than Ubuntu.
+  # Recent Nova in Mitaka requires keystone v3 credentials.
+  # See LP #1542486 for more details.
+  # Drop this case when Ubuntu will update Mitaka packaging.
+  case $::osfamily {
+    'Debian': {
+      class { '::nova::network::neutron':
+        neutron_auth_url    => 'http://127.0.0.1:35357',
+        neutron_auth_plugin => 'password',
+        neutron_password    => 'a_big_secret',
+      }
+    }
+    'RedHat': {
+      class { '::nova::network::neutron':
+        neutron_password => 'a_big_secret',
+      }
+    }
+    default: {
+      fail("Unsupported osfamily (${::osfamily})")
+    }
   }
 
 }
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 85fe21a0e..2defdfff0 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -22,13 +22,13 @@ class openstack_integration::repos {
         manage_priorities => false,
         manage_rdo        => false,
         repo_hash         => {
-          'mitaka-current-passed-ci' => {
-            'baseurl'  => 'http://trunk.rdoproject.org/centos7/current-passed-ci/',
-            'descr'    => 'Mitaka tested',
+          'mitaka-current' => {
+            'baseurl'  => 'https://trunk.rdoproject.org/centos7/5b/14/5b14d1e1de78ca59521b953f7e4e345665e6cea8_563ab7b1/',
+            'descr'    => 'Mitaka Current',
             'gpgcheck' => 'no',
             'priority' => 1,
           },
-          'delorean-deps'            => {
+          'delorean-deps'  => {
             'baseurl'  => 'http://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-liberty/',
             'descr'    => 'Liberty delorean-deps',
             'gpgcheck' => 'no',