From 50cdfe967835ff384035814bce83423d237ca114 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 16 Jun 2016 12:45:24 -0400
Subject: [PATCH] manage_policyrcd: stop eventlet support from Newton

On Ubuntu Xenial, we're deploying Newton and UCA does not provide
keystone eventlet script anymore.

Change-Id: I33e565638f39ace819645215912303d6e431870c
---
 manifests/init.pp                              | 18 ++++++------------
 .../notes/uca_newton-434b3f07a06be290.yaml     |  4 ++++
 spec/classes/keystone_spec.rb                  |  7 -------
 3 files changed, 10 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/uca_newton-434b3f07a06be290.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 3ce3e10dc..5791c450e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -710,9 +710,14 @@ class keystone(
 
   if $manage_policyrcd {
     # openstacklib::policyrcd only affects debian based systems.
-    class { '::openstacklib::policyrcd': services => ['keystone', 'apache2'] }
     Class['::openstacklib::policyrcd'] -> Package['keystone']
     Class['::openstacklib::policyrcd'] -> Package['httpd']
+    # we don't have keystone service anymore starting from Newton
+    if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
+      class { '::openstacklib::policyrcd': services => ['apache2'] }
+    } else {
+      class { '::openstacklib::policyrcd': services => ['keystone', 'apache2'] }
+    }
   }
 
   include ::keystone::db
@@ -993,17 +998,6 @@ class keystone(
   } elsif $service_name == 'httpd' {
     include ::apache::params
     $service_name_real = $::apache::params::service_name
-    if $::osfamily == 'Debian' {
-      class { '::keystone::service':
-        ensure       => 'stopped',
-        service_name => $::keystone::params::service_name,
-        enable       => false,
-        validate     => false,
-      }
-      # leave this here because Ubuntu packages will start Keystone and we need it stopped
-      # before apache can run
-      Service['keystone'] -> Service[$service_name_real]
-    }
   } else {
     fail('Invalid service_name. Either keystone/openstack-keystone for running as a standalone service, or httpd for being run by a httpd server')
   }
diff --git a/releasenotes/notes/uca_newton-434b3f07a06be290.yaml b/releasenotes/notes/uca_newton-434b3f07a06be290.yaml
new file mode 100644
index 000000000..30a081a2f
--- /dev/null
+++ b/releasenotes/notes/uca_newton-434b3f07a06be290.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - If you use Ubuntu Cloud Archives (Canonical) packages and you set manage_policyrcd
+    to true, you won't be able to deloy OpenStack Mitaka.
diff --git a/spec/classes/keystone_spec.rb b/spec/classes/keystone_spec.rb
index 4bb6158ad..515ebdce3 100644
--- a/spec/classes/keystone_spec.rb
+++ b/spec/classes/keystone_spec.rb
@@ -294,13 +294,6 @@ describe 'keystone' do
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError, /expected that the catalogue would contain Service\[#{platform_parameters[:service_name]}\]/)
     end
 
-    it { is_expected.to contain_class('keystone::service').with(
-      'ensure'          => 'stopped',
-      'service_name'    => platform_parameters[:service_name],
-      'enable'          => false,
-      'validate'        => false
-    )}
-    it { is_expected.to contain_service('httpd').with_before(/Anchor\[keystone::service::end\]/) }
     it { is_expected.to contain_exec('restart_keystone').with(
       'command' => "service #{platform_parameters[:httpd_service_name]} restart",
     ) }