From 59a062b689485b752a60d073892af4a6dbd2568b Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Thu, 31 Aug 2017 09:50:04 -0700
Subject: [PATCH] Remove remaining service_name properties

These variables are not used and were recently accidentally re-added.

Change-Id: If15b24a0cc7b7a6b6d3abeab5899ef90d5c6fe80
---
 playbooks/inventory/env.d/cinder.yml | 2 --
 playbooks/inventory/env.d/trove.yml  | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/playbooks/inventory/env.d/cinder.yml b/playbooks/inventory/env.d/cinder.yml
index df5acb0c74..d71a61a84e 100644
--- a/playbooks/inventory/env.d/cinder.yml
+++ b/playbooks/inventory/env.d/cinder.yml
@@ -34,8 +34,6 @@ container_skel:
       - storage-infra_containers
     contains:
       - cinder_api
-    properties:
-      service_name: cinder
   cinder_scheduler_container:
     belongs_to:
       - storage-infra_containers
diff --git a/playbooks/inventory/env.d/trove.yml b/playbooks/inventory/env.d/trove.yml
index 30284c1b2f..f64ec2a38f 100644
--- a/playbooks/inventory/env.d/trove.yml
+++ b/playbooks/inventory/env.d/trove.yml
@@ -33,15 +33,11 @@ container_skel:
       - trove-infra_containers
     contains:
       - trove_api
-    properties:
-      service_name: trove
   trove_conductor_container:
     belongs_to:
       - trove-infra_containers
     contains:
       - trove_conductor
-    properties:
-      service_name: trove
   trove_taskmanager_container:
     belongs_to:
       - trove-infra_containers