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

diff --git a/compute-config.yaml b/compute-config.yaml
index 45bb8e1..dc1f690 100644 (file)
--- 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 3095a7a..c2e9d21 100644 (file)
--- 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 2d8168c..8129cfa 100644 (file)
--- 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 acfed21..53b365b 100644 (file)
--- 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 0a5f5c8..9bc231e 100644 (file)
--- 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 2de3fd2..ab7f17c 100644 (file)
--- 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