Merge "Leverage kolla config_files to copy config into containers"

manifests/profile/pacemaker/cinder/backup_bundle.pp

@@ -85,13 +85,8 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
             'options'    => 'ro',
           },
           'cinder-backup-cfg-data'       => {
-            'source-dir' => '/var/lib/config-data/cinder/etc/cinder',
+            'source-dir' => '/var/lib/config-data/puppet-generated/cinder/',
-            'target-dir' => '/etc/cinder',
+            'target-dir' => '/var/lib/kolla/config_files/src',
-            'options'    => 'ro',
-          },
-          'cinder-backup-cfg-ceph'       => {
-            'source-dir' => '/var/lib/config-data/cinder/etc/ceph',
-            'target-dir' => '/etc/ceph',
             'options'    => 'ro',
           },
           'cinder-backup-hosts'          => {

manifests/profile/pacemaker/cinder/volume_bundle.pp

@@ -85,8 +85,8 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
             'options'    => 'ro',
           },
           'cinder-volume-cfg-data'       => {
-            'source-dir' => '/var/lib/config-data/cinder/etc/cinder',
+            'source-dir' => '/var/lib/config-data/puppet-generated/cinder/',
-            'target-dir' => '/etc/cinder',
+            'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },
           'cinder-volume-hosts'          => {

manifests/profile/pacemaker/database/mysql_bundle.pp

@@ -215,7 +215,7 @@ MYSQL_HOST=localhost\n",
             'options'    => 'ro',
           },
           'mysql-cfg-data'                => {
-            'source-dir' => '/var/lib/config-data/mysql',
+            'source-dir' => '/var/lib/config-data/puppet-generated/mysql/',
             'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },

manifests/profile/pacemaker/database/redis_bundle.pp

@@ -89,23 +89,8 @@ class tripleo::profile::pacemaker::database::redis_bundle (
             'options'    => 'ro',
           },
           'redis-cfg-data-redis'          => {
-            'source-dir' => '/var/lib/config-data/redis/etc/redis',
+            'source-dir' => '/var/lib/config-data/puppet-generated/redis/',
-            'target-dir' => '/etc/redis',
+            'target-dir' => '/var/lib/kolla/config_files/src',
-            'options'    => 'ro',
-          },
-          'redis-cfg-data-redis-conf'        => {
-            'source-dir' => '/var/lib/config-data/redis/etc/redis.conf',
-            'target-dir' => '/etc/redis.conf',
-            'options'    => 'ro',
-          },
-          'redis-cfg-data-redis-conf-puppet' => {
-            'source-dir' => '/var/lib/config-data/redis/etc/redis.conf.puppet',
-            'target-dir' => '/etc/redis.conf.puppet',
-            'options'    => 'ro',
-          },
-          'redis-cfg-data-redis-sentinel'    => {
-            'source-dir' => '/var/lib/config-data/redis/etc/redis-sentinel.conf',
-            'target-dir' => '/etc/redis-sentinel.conf',
             'options'    => 'ro',
           },
           'redis-hosts'                   => {

manifests/profile/pacemaker/haproxy_bundle.pp

@@ -104,8 +104,8 @@ class tripleo::profile::pacemaker::haproxy_bundle (
             'options'    => 'ro',
           },
           'haproxy-cfg-data'                => {
-            'source-dir' => '/var/lib/config-data/haproxy/etc',
+            'source-dir' => '/var/lib/config-data/puppet-generated/haproxy/',
-            'target-dir' => '/etc',
+            'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },
           'haproxy-hosts'                   => {

manifests/profile/pacemaker/rabbitmq_bundle.pp

@@ -121,8 +121,8 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
             'options'    => 'ro',
           },
           'rabbitmq-cfg-data'                => {
-            'source-dir' => '/var/lib/config-data/rabbitmq/etc/rabbitmq',
+            'source-dir' => '/var/lib/config-data/puppet-generated/rabbitmq/',
-            'target-dir' => '/etc/rabbitmq',
+            'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },
           'rabbitmq-hosts'                   => {