From c88cd87cde404a49a69a3b7fc706a530ef9bd13a Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Fri, 14 Oct 2016 14:42:10 -0700
Subject: [PATCH] Remove nova-cert

nova-cert has been marked for deprecation and removal in Ocata.

Change-Id: Ia2e5fdfc995d3bf3790f23a0579ee8757d215851
---
 README.rst                                                   | 1 -
 defaults/main.yml                                            | 3 ---
 .../notes/os-nova-remove-nova-cert-441989f79b69524f.yaml     | 5 +++++
 templates/nova.conf.j2                                       | 2 +-
 tests/inventory                                              | 4 ----
 5 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/os-nova-remove-nova-cert-441989f79b69524f.yaml

diff --git a/README.rst b/README.rst
index 201456cf..02ab22b0 100644
--- a/README.rst
+++ b/README.rst
@@ -10,7 +10,6 @@ This role will install the following:
     * nova-conductor
     * nova-scheduler
     * nova-console
-    * nova-cert
     * nova-compute
 
 Documentation for the project can be found at:
diff --git a/defaults/main.yml b/defaults/main.yml
index 38745867..9f5393e5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -367,9 +367,6 @@ nova_services:
   nova-api-os-compute:
     group: nova_api_os_compute
     service_name: nova-api-os-compute
-  nova-cert:
-    group: nova_cert
-    service_name: nova-cert
   nova-compute:
     group: nova_compute
     service_name: nova-compute
diff --git a/releasenotes/notes/os-nova-remove-nova-cert-441989f79b69524f.yaml b/releasenotes/notes/os-nova-remove-nova-cert-441989f79b69524f.yaml
new file mode 100644
index 00000000..b76ca86a
--- /dev/null
+++ b/releasenotes/notes/os-nova-remove-nova-cert-441989f79b69524f.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - The nova-cert service has been deprecated, is marked
+    for removal in the Ocata release, and will no longer
+    be deployed by the os_nova role.
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 3af986a5..f223f56b 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -226,7 +226,7 @@ memcache_secret_key = {{ memcached_encryption_key }}
 check_revocations_for_cached = False
 
 
-{% if inventory_hostname in (groups['nova_conductor'] + groups['nova_scheduler'] + groups['nova_api_os_compute'] + groups['nova_api_metadata'] + groups['nova_console'] + groups['nova_cert']) %}
+{% if inventory_hostname in (groups['nova_conductor'] + groups['nova_scheduler'] + groups['nova_api_os_compute'] + groups['nova_api_metadata'] + groups['nova_console']) %}
 [database]
 connection = mysql+pymysql://{{ nova_galera_user }}:{{ nova_container_mysql_password }}@{{ nova_galera_address }}/{{ nova_galera_database }}?charset=utf8
 max_overflow = {{ nova_db_max_overflow }}
diff --git a/tests/inventory b/tests/inventory
index 850ea4cd..ea9837c7 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -78,9 +78,6 @@ openstack1
 [nova_api_os_compute]
 openstack1
 
-[nova_cert]
-openstack1
-
 [nova_compute]
 localhost
 
@@ -96,7 +93,6 @@ openstack1
 [nova_all:children]
 nova_api_metadata
 nova_api_os_compute
-nova_cert
 nova_compute
 nova_conductor
 nova_console