openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Leverage kolla config_files to copy config into containers"

Browse Source
This commit is contained in:
Jenkins
2017-07-13 01:33:47 +00:00
committed by Gerrit Code Review
parent 0e2df4309c 1e90178298
commit dbc3c765e5
6 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/pacemaker/cinder/backup_bundle.pp
View File

@@ -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' => {

4
manifests/profile/pacemaker/cinder/volume_bundle.pp
View File

@@ -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' => {

2
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@@ -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',
},

43
manifests/profile/pacemaker/database/redis_bundle.pp
View File

@@ -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',

4
manifests/profile/pacemaker/haproxy_bundle.pp
View File

@@ -104,8 +104,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' => {

4
manifests/profile/pacemaker/rabbitmq_bundle.pp
View File

@@ -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' => {