Merge "Don't store Ceilo DB credentials on compute node"

6 files changed, 0 insertions, 20 deletions

diff --git a/compute-config.yaml b/compute-config.yaml
index 8cc73103..9698cc3b 100644
--- a/compute-config.yaml
+++ b/compute-config.yaml
@@ -24,7 +24,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 a7a7ab8c..66d4bef0 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.
@@ -274,7 +272,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 639d971e..70172cb2 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.
@@ -210,7 +208,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 d62a0939..a3d1e34f 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -423,12 +423,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 803a5016..7578cc2a 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