Merge pull request #285 from vyzigold/finish_customConfig

openshift-merge-bot[bot] · web-flow · commit be84db57f62f · 2024-01-25T21:32:04.000Z
Add the customServiceConfig functionality
diff --git a/templates/autoscaling/config/aodh-api-config.json b/templates/autoscaling/config/aodh-api-config.json
@@ -7,6 +7,13 @@
         "owner": "aodh",
         "perm": "0600"
       },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/aodh/aodh.conf.d/01-aodh-custom.conf",
+        "owner": "aodh",
+        "perm": "0600",
+        "optional": true
+      },
       {
         "source": "/var/lib/openstack/config/wsgi-aodh.conf",
         "dest": "/etc/httpd/conf.d/00wsgi-aodh.conf",
diff --git a/templates/autoscaling/config/aodh-dbsync-config.json b/templates/autoscaling/config/aodh-dbsync-config.json
@@ -6,6 +6,13 @@
                         "dest": "/etc/aodh/aodh.conf",
                         "owner": "aodh",
                         "perm": "0600"
+                },
+                {
+                        "source": "/var/lib/openstack/config/custom.conf",
+                        "dest": "/etc/aodh/aodh.conf.d/01-aodh-custom.conf",
+                        "owner": "aodh",
+                        "perm": "0600",
+                        "optional": true
                 }
         ]
 }
diff --git a/templates/autoscaling/config/aodh-evaluator-config.json b/templates/autoscaling/config/aodh-evaluator-config.json
@@ -7,6 +7,13 @@
         "owner": "aodh",
         "perm": "0600"
       },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/aodh/aodh.conf.d/01-aodh-custom.conf",
+        "owner": "aodh",
+        "perm": "0600",
+        "optional": true
+      },
       {
         "source": "/var/lib/openstack/config/prometheus.yaml",
         "dest": "/etc/openstack/prometheus.yaml",
diff --git a/templates/autoscaling/config/aodh-listener-config.json b/templates/autoscaling/config/aodh-listener-config.json
@@ -6,6 +6,13 @@
         "dest": "/etc/aodh/aodh.conf",
         "owner": "aodh",
         "perm": "0600"
+      },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/aodh/aodh.conf.d/01-aodh-custom.conf",
+        "owner": "aodh",
+        "perm": "0600",
+        "optional": true
       }
     ]
   }
diff --git a/templates/autoscaling/config/aodh-notifier-config.json b/templates/autoscaling/config/aodh-notifier-config.json
@@ -6,6 +6,13 @@
         "dest": "/etc/aodh/aodh.conf",
         "owner": "aodh",
         "perm": "0600"
+      },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/aodh/aodh.conf.d/01-aodh-custom.conf",
+        "owner": "aodh",
+        "perm": "0600",
+        "optional": true
       }
     ]
   }
diff --git a/templates/ceilometercentral/config/ceilometer-central-config.json b/templates/ceilometercentral/config/ceilometer-central-config.json
@@ -12,6 +12,13 @@
         "dest": "/etc/ceilometer/polling.yaml",
         "owner": "ceilometer",
         "perm": "0600"
+      },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/ceilometer/ceilometer.conf.d/01-ceilometer-custom.conf",
+        "owner": "ceilometer",
+        "perm": "0600",
+        "optional": true
       }
     ]
   }
diff --git a/templates/ceilometercentral/config/ceilometer-notification-config.json b/templates/ceilometercentral/config/ceilometer-notification-config.json
@@ -12,6 +12,13 @@
         "dest": "/etc/ceilometer/pipeline.yaml",
         "owner": "ceilometer",
         "perm": "0600"
+      },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/ceilometer/ceilometer.conf.d/01-ceilometer-custom.conf",
+        "owner": "ceilometer",
+        "perm": "0600",
+        "optional": true
       }
     ]
   }
diff --git a/templates/ceilometercompute/config/ceilometer-agent-compute.json b/templates/ceilometercompute/config/ceilometer-agent-compute.json
@@ -12,6 +12,13 @@
         "dest": "/etc/ceilometer/polling.yaml",
         "owner": "ceilometer",
         "perm": "0600"
+      },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/ceilometer/ceilometer.conf.d/01-ceilometer-custom.conf",
+        "owner": "ceilometer",
+        "perm": "0600",
+        "optional": true
       }
     ]
   }
diff --git a/templates/ceilometercompute/config/ceilometer-agent-ipmi.json b/templates/ceilometercompute/config/ceilometer-agent-ipmi.json
@@ -12,6 +12,13 @@
         "dest": "/etc/ceilometer/polling.yaml",
         "owner": "ceilometer",
         "perm": "0600"
+      },
+      {
+        "source": "/var/lib/openstack/config/custom.conf",
+        "dest": "/etc/ceilometer/ceilometer.conf.d/01-ceilometer-custom.conf",
+        "owner": "ceilometer",
+        "perm": "0600",
+        "optional": true
       }
     ]
   }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,13 @@`
`6`	`6`	`"dest": "/etc/aodh/aodh.conf",`
`7`	`7`	`"owner": "aodh",`
`8`	`8`	`"perm": "0600"`
	`9`	`+ },`
	`10`	`+ {`
	`11`	`+ "source": "/var/lib/openstack/config/custom.conf",`
	`12`	`+ "dest": "/etc/aodh/aodh.conf.d/01-aodh-custom.conf",`
	`13`	`+ "owner": "aodh",`
	`14`	`+ "perm": "0600",`
	`15`	`+ "optional": true`
`9`	`16`	`}`
`10`	`17`	`]`
`11`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,13 @@`
`12`	`12`	`"dest": "/etc/ceilometer/polling.yaml",`
`13`	`13`	`"owner": "ceilometer",`
`14`	`14`	`"perm": "0600"`
	`15`	`+ },`
	`16`	`+ {`
	`17`	`+ "source": "/var/lib/openstack/config/custom.conf",`
	`18`	`+ "dest": "/etc/ceilometer/ceilometer.conf.d/01-ceilometer-custom.conf",`
	`19`	`+ "owner": "ceilometer",`
	`20`	`+ "perm": "0600",`
	`21`	`+ "optional": true`
`15`	`22`	`}`
`16`	`23`	`]`
`17`	`24`	`}`