From 5dcd51eca2c5b14aa4bbb775ccdb2a8581389f94 Mon Sep 17 00:00:00 2001
From: David Moreau-Simard <dms@redhat.com>
Date: Mon, 4 Jul 2016 21:50:06 -0400
Subject: [PATCH] Fix typo that would make the package name the service name

Since the service and the package name can differ, it is important
to really choose the PACKAGE name and not the SERVICE name.
For example, in RDO, the package is
"openstack-designate-pool-manager" but the service is
"designate-pool-manager".

Additionally, the package name for "designate-pool-manager" is
"designate-pool-manager" in Ubuntu Cloud Archive [1]. Not
"openstack-designate-pool-manager".

[1]: http://ubuntu-cloud.archive.canonical.com/ubuntu/dists/xenial-updates/newton/main/binary-amd64/Packages

Change-Id: I1d0b9b66b7fb5ec97d0992c2efd58b63359d364d
---
 manifests/params.pp       | 2 +-
 manifests/pool_manager.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 789f609b..a910d0dc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -36,7 +36,7 @@ class designate::params {
       $agent_package_name        = 'designate-agent'
       $sink_package_name         = 'designate-sink'
       $pymysql_package_name      = 'python-pymysql'
-      $pool_manager_package_name = 'openstack-designate-pool-manager'
+      $pool_manager_package_name = 'designate-pool-manager'
       $mdns_package_name         = 'designate-mdns'
       # service names
       $agent_service_name        = 'designate-agent'
diff --git a/manifests/pool_manager.pp b/manifests/pool_manager.pp
index beccc79b..0dd26c5d 100644
--- a/manifests/pool_manager.pp
+++ b/manifests/pool_manager.pp
@@ -115,7 +115,7 @@ class designate::pool_manager(
   if $manage_package {
     package { 'designate-pool-manager':
       ensure => $package_ensure,
-      name   => pick($pool_manager_package_name, $::designate::params::pool_manager_service_name),
+      name   => pick($pool_manager_package_name, $::designate::params::pool_manager_package_name),
       tag    => ['openstack', 'designate-package'],
     }
   }