Merge "Integrate oslo-config-validator"

ansible/roles/aodh/defaults/main.yml

@@ -55,6 +55,12 @@ aodh_services:
 # change this option.
 aodh_evaluation_interval: 300
 
+####################
+# Config Validate
+####################
+aodh_config_validation:
+  - generator: "/aodh/aodh/cmd/aodh-config-generator.conf"
+    config: "/etc/aodh/aodh.conf"
 
 ####################
 # Database

ansible/roles/aodh/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ aodh_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ aodh_config_validation }}"

ansible/roles/barbican/defaults/main.yml

@@ -40,6 +40,12 @@ barbican_services:
     dimensions: "{{ barbican_worker_dimensions }}"
     healthcheck: "{{ barbican_worker_healthcheck }}"
 
+####################
+# Config Validate
+####################
+barbican_config_validation:
+  - generator: "/barbican/etc/oslo-config-generator/barbican.conf"
+    config: "/etc/barbican/barbican.conf"
 
 ####################
 # Database

ansible/roles/barbican/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ barbican_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ barbican_config_validation }}"

ansible/roles/bifrost/tasks/config_validate.yml

+---

ansible/roles/blazar/defaults/main.yml

@@ -34,6 +34,13 @@ blazar_services:
 ####################
 blazar_aggregate_pool_name: "freepool"
 
+####################
+# Config Validate
+####################
+blazar_config_validation:
+  - generator: "/blazar/etc/blazar/blazar-config-generator.conf"
+    config: "/etc/blazar/blazar.conf"
+
 ####################
 # Database
 ####################

ansible/roles/blazar/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ blazar_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ blazar_config_validation }}"

ansible/roles/ceilometer/defaults/main.yml

@@ -34,6 +34,12 @@ ceilometer_services:
     dimensions: "{{ ceilometer_ipmi_dimensions }}"
     healthcheck: "{{ ceilometer_ipmi_healthcheck }}"
 
+####################
+# Config Validate
+####################
+ceilometer_config_validation:
+  - generator: "/ceilometer/etc/ceilometer/ceilometer-config-generator.conf"
+    config: "/etc/ceilometer/ceilometer.conf"
 
 ####################
 # Docker

ansible/roles/ceilometer/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ ceilometer_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ ceilometer_config_validation }}"

ansible/roles/ceph-rgw/tasks/config_validate.yml

+---

ansible/roles/cinder/defaults/main.yml

@@ -52,6 +52,13 @@ cinder_services:
     dimensions: "{{ cinder_backup_dimensions }}"
     healthcheck: "{{ cinder_backup_healthcheck }}"
 
+####################
+# Config Validate
+####################
+cinder_config_validation:
+  - generator: "/cinder/tools/config/cinder-config-generator.conf"
+    config: "/etc/cinder/cinder.conf"
+
 ####################
 # Database
 ####################

ansible/roles/cinder/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ cinder_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ cinder_config_validation }}"

ansible/roles/cloudkitty/defaults/main.yml

@@ -28,6 +28,12 @@ cloudkitty_services:
     dimensions: "{{ cloudkitty_processor_dimensions }}"
     healthcheck: "{{ cloudkitty_processor_healthcheck }}"
 
+####################
+# Config Validate
+####################
+cloudkitty_config_validation:
+  - generator: "/cloudkitty/etc/oslo-config-generator/cloudkitty.conf"
+    config: "/etc/cloudkitty/cloudkitty.conf"
 
 ####################
 # Database

ansible/roles/cloudkitty/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ cloudkitty_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ cloudkitty_config_validation }}"

ansible/roles/collectd/tasks/config_validate.yml

+---

ansible/roles/common/tasks/config_validate.yml

+---

ansible/roles/cyborg/defaults/main.yml

@@ -26,6 +26,13 @@ cyborg_services:
     dimensions: "{{ cyborg_conductor_dimensions }}"
     healthcheck: "{{ cyborg_conductor_healthcheck }}"
 
+####################
+# Config Validate
+####################
+cyborg_config_validation:
+  - generator: "/cyborg/tools/config/cyborg-config-generator.conf"
+    config: "/etc/cyborg/cyborg.conf"
+
 ####################
 # Database
 ####################

ansible/roles/cyborg/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ cyborg_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ cyborg_config_validation }}"

ansible/roles/designate/defaults/main.yml

@@ -70,6 +70,12 @@ designate_services:
     dimensions: "{{ designate_sink_dimensions }}"
     healthcheck: "{{ designate_sink_healthcheck }}"
 
+####################
+# Config Validate
+####################
+designate_config_validation:
+  - generator: "/designate/etc/designate/designate-config-generator.conf"
+    config: "/etc/designate/designate.conf"
 
 ####################
 # Database

ansible/roles/designate/tasks/config_validate.yml

+---
+- import_role:
+    name: service-config-validate
+  vars:
+    service_config_validate_services: "{{ designate_services }}"
+    service_name: "{{ project_name }}"
+    service_config_validation: "{{ designate_config_validation }}"