From 103f3109d43e2a79a236b9cdc4200fa39e1d9681 Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Fri, 5 Sep 2014 13:31:38 +0100
Subject: [PATCH] Deploy nova-cert

Currently, we do not deploy nova-cert.  As we do not use the ec2 API
extensively we've not run into any issues however it should exist
for those that choose to use the ec2 API.
---
 etc/rpc_deploy/rpc_environment.yml            |  8 +++++
 etc/rpc_deploy/rpc_user_config.yml            |  2 +-
 .../playbooks/openstack/nova-all.yml          |  1 +
 .../playbooks/openstack/nova-cert.yml         | 32 +++++++++++++++++++
 .../vars/openstack_service_vars/nova_cert.yml | 19 +++++++++++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 rpc_deployment/playbooks/openstack/nova-cert.yml
 create mode 100644 rpc_deployment/vars/openstack_service_vars/nova_cert.yml

diff --git a/etc/rpc_deploy/rpc_environment.yml b/etc/rpc_deploy/rpc_environment.yml
index 87e1c73b6c..8c27fb6230 100644
--- a/etc/rpc_deploy/rpc_environment.yml
+++ b/etc/rpc_deploy/rpc_environment.yml
@@ -92,6 +92,9 @@ component_skel:
   nova_api_os_compute:
     belongs_to:
     - nova_all
+  nova_cert:
+    belongs_to:
+    - nova_all
   nova_compute:
     belongs_to:
     - nova_all
@@ -208,6 +211,11 @@ container_skel:
     - infra_containers
     contains:
     - nova_api_os_compute
+  nova_cert_container:
+    belongs_to:
+    - infra_containers
+    contains:
+    - nova_cert
   nova_compute_container:
     is_metal: true
     belongs_to:
diff --git a/etc/rpc_deploy/rpc_user_config.yml b/etc/rpc_deploy/rpc_user_config.yml
index c66b30c6e8..bf27e06c39 100644
--- a/etc/rpc_deploy/rpc_user_config.yml
+++ b/etc/rpc_deploy/rpc_user_config.yml
@@ -15,7 +15,7 @@
 
 # This is the md5 of the environment file
 # this will ensure consistency when deploying.
-environment_version: 5e7155d022462c5a82384c1b2ed8b946
+environment_version: e0955a92a761d5845520a82dcca596af
 
 # User defined CIDR used for containers
 # Global cidr/s used for everything.
diff --git a/rpc_deployment/playbooks/openstack/nova-all.yml b/rpc_deployment/playbooks/openstack/nova-all.yml
index 83e733cf54..9d029a622c 100644
--- a/rpc_deployment/playbooks/openstack/nova-all.yml
+++ b/rpc_deployment/playbooks/openstack/nova-all.yml
@@ -18,6 +18,7 @@
 - include: nova-api-metadata.yml
 - include: nova-scheduler.yml
 - include: nova-conductor.yml
+- include: nova-cert.yml
 - include: nova-compute.yml
 - include: nova-compute-keys.yml
 - include: nova-spice-console.yml
diff --git a/rpc_deployment/playbooks/openstack/nova-cert.yml b/rpc_deployment/playbooks/openstack/nova-cert.yml
new file mode 100644
index 0000000000..c498b42534
--- /dev/null
+++ b/rpc_deployment/playbooks/openstack/nova-cert.yml
@@ -0,0 +1,32 @@
+---
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- hosts: nova_cert
+  user: root
+  roles:
+    - common
+    - common_sudoers
+    - container_common
+    - openstack_common
+    - openstack_openrc
+    - nova_common
+    - galera_client_cnf
+    - init_script
+  vars_files:
+    - inventory/group_vars/nova_all.yml
+    - vars/openstack_service_vars/nova_cert.yml
+    - vars/openstack_service_vars/nova_spice_console_endpoint.yml
+  handlers:
+    - include: handlers/services.yml
diff --git a/rpc_deployment/vars/openstack_service_vars/nova_cert.yml b/rpc_deployment/vars/openstack_service_vars/nova_cert.yml
new file mode 100644
index 0000000000..bb207b2b72
--- /dev/null
+++ b/rpc_deployment/vars/openstack_service_vars/nova_cert.yml
@@ -0,0 +1,19 @@
+---
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# The variables file used by the playbooks in the nova-conductor group.
+# These don't have to be explicitly imported by vars_files: they are autopopulated.
+
+program_name: nova-cert