From 84c7b32c41cca4e52e52e144550d5e718bbe62f3 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Sun, 7 Dec 2014 15:03:42 -0500
Subject: [PATCH] Don't store Ceilo DB credentials on compute node

This patch removes all references to the Ceilometer DSN parameter
in the overcloud compute templates. These credentials
are not required in order to run the required Ceilometer
service/agents.

Change-Id: I421ce4fca87ac87dd65ab8bbb20e7ea9be8d9c5d
---
 compute-config.yaml            | 1 -
 compute.yaml                   | 3 ---
 nova-compute-config.yaml       | 1 -
 nova-compute-instance.yaml     | 3 ---
 overcloud-source.yaml          | 6 ------
 overcloud-without-mergepy.yaml | 6 ------
 6 files changed, 20 deletions(-)

diff --git a/compute-config.yaml b/compute-config.yaml
index 45bb8e1e..dc1f690a 100644
--- a/compute-config.yaml
+++ b/compute-config.yaml
@@ -17,7 +17,6 @@ resources:
           public_ip: {get_input: nova_public_ip}
           service-password: {get_input: nova_password}
         ceilometer:
-          db: {get_input: ceilometer_dsn}
           debug: {get_input: debug}
           metering_secret: {get_input: ceilometer_metering_secret}
           service-password: {get_input: ceilometer_password}
diff --git a/compute.yaml b/compute.yaml
index 3095a7af..c2e9d218 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -15,8 +15,6 @@ parameters:
     default: ''
     constraints:
     - allowed_values: ['', Present]
-  CeilometerDSN:
-    type: string
   CeilometerMeteringSecret:
     default: unset
     description: Secret shared by the ceilometer services.
@@ -259,7 +257,6 @@ resources:
         nova_public_ip: {get_param: NovaPublicIP}
         nova_api_host: {get_param: NovaApiHost}
         nova_password: {get_param: NovaPassword}
-        ceilometer_dsn: {get_param: CeilometerDSN}
         ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
         ceilometer_password: {get_param: CeilometerPassword}
         ceilometer_compute_agent: {get_param: CeilometerComputeAgent}
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 2d8168c0..8129cfa1 100644
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -12,7 +12,6 @@ resources:
           public_ip: {get_input: nova_public_ip}
           service-password: {get_input: nova_password}
         ceilometer:
-          db: {get_input: ceilometer_dsn}
           debug: {get_param: Debug}
           metering_secret: {get_input: ceilometer_metering_secret}
           service-password: {get_input: ceilometer_password}
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index acfed21d..53b365b7 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -15,8 +15,6 @@ parameters:
     default: ''
     constraints:
     - allowed_values: ['', Present]
-  CeilometerDSN:
-    type: string
   CeilometerMeteringSecret:
     default: unset
     description: Secret shared by the ceilometer services.
@@ -209,7 +207,6 @@ resources:
         nova_public_ip: {get_param: NovaPublicIP}
         nova_api_host: {get_param: NovaApiHost}
         nova_password: {get_param: NovaPassword}
-        ceilometer_dsn: {get_param: CeilometerDSN}
         ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
         ceilometer_password: {get_param: CeilometerPassword}
         ceilometer_compute_agent: {get_param: CeilometerComputeAgent}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 0a5f5c89..9bc231ea 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -421,12 +421,6 @@ resources:
         GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         NovaPublicIP: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
-        CeilometerDSN:
-          Fn::Join:
-            - ''
-            - - mysql://ceilometer:unset@
-              - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
-              - /ceilometer
         NeutronNetworkType:
             get_param: NeutronNetworkType
         NeutronTunnelTypes:
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 2de3fd2c..ab7f17ca 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -577,12 +577,6 @@ resources:
           RabbitUserName: {get_param: RabbitUserName}
           SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName}
           SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword}
-          CeilometerDSN:
-            list_join:
-              - ''
-              - - mysql://ceilometer:unset@
-                - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
-                - /ceilometer
 
   BlockStorage:
     type: OS::Heat::ResourceGroup
-- 
2.16.6