From 1e90178298d77c23e654c374f17f999f4d9274e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Mon, 26 Jun 2017 15:33:09 +0200
Subject: [PATCH] Leverage kolla config_files to copy config into containers

This solves a problem with bind-mounts when the containers are holding
files descriptors open.

At the same time this makes the template more robust to puppet changes
since new config files will be available in the containers without
needing to update the templates.

Closes-Bug: #1698323
Change-Id: I857c94ba5f7f064d7c58df621ec5d477654b9166
Depends-On: I78dcec741a941dc21adba33ba33a6dc6ff1d217c
---
 .../profile/pacemaker/cinder/backup_bundle.pp |  9 +---
 .../profile/pacemaker/cinder/volume_bundle.pp |  4 +-
 .../pacemaker/database/mysql_bundle.pp        |  2 +-
 .../pacemaker/database/redis_bundle.pp        | 43 ++++++-------------
 manifests/profile/pacemaker/haproxy_bundle.pp |  4 +-
 .../profile/pacemaker/rabbitmq_bundle.pp      |  4 +-
 6 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index a5e1a9bda..2a82c3e86 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/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',
-            'target-dir' => '/etc/cinder',
-            'options'    => 'ro',
-          },
-          'cinder-backup-cfg-ceph'       => {
-            'source-dir' => '/var/lib/config-data/cinder/etc/ceph',
-            'target-dir' => '/etc/ceph',
+            'source-dir' => '/var/lib/config-data/puppet-generated/cinder/',
+            'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },
           'cinder-backup-hosts'          => {
diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp
index 39199a590..8d58036ee 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/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',
-            'target-dir' => '/etc/cinder',
+            'source-dir' => '/var/lib/config-data/puppet-generated/cinder/',
+            'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },
           'cinder-volume-hosts'          => {
diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp
index 56e9e28ab..a80b2def7 100644
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/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',
           },
diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp
index dd090d7b8..ea153a8e1 100644
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@@ -83,77 +83,62 @@ class tripleo::profile::pacemaker::database::redis_bundle (
         run_command       => '/bin/bash /usr/local/bin/kolla_start',
         network           => "control-port=${redis_docker_control_port}",
         storage_maps      => {
-          'redis-cfg-files'                  => {
+          'redis-cfg-files'               => {
             'source-dir' => '/var/lib/kolla/config_files/redis.json',
             'target-dir' => '/var/lib/kolla/config_files/config.json',
             'options'    => 'ro',
           },
-          'redis-cfg-data-redis'             => {
-            'source-dir' => '/var/lib/config-data/redis/etc/redis',
-            'target-dir' => '/etc/redis',
+          'redis-cfg-data-redis'          => {
+            'source-dir' => '/var/lib/config-data/puppet-generated/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'                      => {
+          'redis-hosts'                   => {
             'source-dir' => '/etc/hosts',
             'target-dir' => '/etc/hosts',
             'options'    => 'ro',
           },
-          'redis-localtime'                  => {
+          'redis-localtime'               => {
             'source-dir' => '/etc/localtime',
             'target-dir' => '/etc/localtime',
             'options'    => 'ro',
           },
-          'redis-lib'                        => {
+          'redis-lib'                     => {
             'source-dir' => '/var/lib/redis',
             'target-dir' => '/var/lib/redis',
             'options'    => 'rw',
           },
-          'redis-log'                        => {
+          'redis-log'                     => {
             'source-dir' => '/var/log/redis',
             'target-dir' => '/var/log/redis',
             'options'    => 'rw',
           },
-          'redis-run'                        => {
+          'redis-run'                     => {
             'source-dir' => '/var/run/redis',
             'target-dir' => '/var/run/redis',
             'options'    => 'rw',
           },
-          'redis-pki-extracted'              => {
+          'redis-pki-extracted'           => {
             'source-dir' => '/etc/pki/ca-trust/extracted',
             'target-dir' => '/etc/pki/ca-trust/extracted',
             'options'    => 'ro',
           },
-          'redis-pki-ca-bundle-crt'          => {
+          'redis-pki-ca-bundle-crt'       => {
             'source-dir' => '/etc/pki/tls/certs/ca-bundle.crt',
             'target-dir' => '/etc/pki/tls/certs/ca-bundle.crt',
             'options'    => 'ro',
           },
-          'redis-pki-ca-bundle-trust-crt'    => {
+          'redis-pki-ca-bundle-trust-crt' => {
             'source-dir' => '/etc/pki/tls/certs/ca-bundle.trust.crt',
             'target-dir' => '/etc/pki/tls/certs/ca-bundle.trust.crt',
             'options'    => 'ro',
           },
-          'redis-pki-cert'                   => {
+          'redis-pki-cert'                => {
             'source-dir' => '/etc/pki/tls/cert.pem',
             'target-dir' => '/etc/pki/tls/cert.pem',
             'options'    => 'ro',
           },
-          'redis-dev-log'                    => {
+          'redis-dev-log'                 => {
             'source-dir' => '/dev/log',
             'target-dir' => '/dev/log',
             'options'    => 'rw',
diff --git a/manifests/profile/pacemaker/haproxy_bundle.pp b/manifests/profile/pacemaker/haproxy_bundle.pp
index 9c1bdf36d..0f71b8299 100644
--- a/manifests/profile/pacemaker/haproxy_bundle.pp
+++ b/manifests/profile/pacemaker/haproxy_bundle.pp
@@ -98,8 +98,8 @@ class tripleo::profile::pacemaker::haproxy_bundle (
             'options'    => 'ro',
           },
           'haproxy-cfg-data'                => {
-            'source-dir' => '/var/lib/config-data/haproxy/etc',
-            'target-dir' => '/etc',
+            'source-dir' => '/var/lib/config-data/puppet-generated/haproxy/',
+            'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },
           'haproxy-hosts'                   => {
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index 0a6295c01..2f848b451 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/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',
-            'target-dir' => '/etc/rabbitmq',
+            'source-dir' => '/var/lib/config-data/puppet-generated/rabbitmq/',
+            'target-dir' => '/var/lib/kolla/config_files/src',
             'options'    => 'ro',
           },
           'rabbitmq-hosts'                   => {