diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index ff1d9d020a..11fbd13c4c 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -199,7 +199,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/aodh_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro - /var/log/containers/aodh:/var/log/aodh - /var/log/containers/httpd/aodh-api:/var/log/httpd - diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index 988755b4c2..eed91b3921 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml @@ -103,7 +103,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/aodh_evaluator.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro - /var/log/containers/aodh:/var/log/aodh:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index 9b58c13d82..49e20e6fd3 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/deployment/aodh/aodh-listener-container-puppet.yaml @@ -103,7 +103,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/aodh_listener.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro - /var/log/containers/aodh:/var/log/aodh:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index a33f90f3b3..f2e17ceb42 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/deployment/aodh/aodh-notifier-container-puppet.yaml @@ -103,7 +103,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/aodh_notifier.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro - /var/log/containers/aodh:/var/log/aodh:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 2261006150..075bb3015a 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -655,7 +655,7 @@ outputs: - {get_attr: [BarbicanApiLogging, volumes]} - - /var/lib/kolla/config_files/barbican_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/barbican:/var/lib/kolla/config_files/src:ro - if: - internal_tls_enabled @@ -693,7 +693,7 @@ outputs: - {get_attr: [BarbicanApiLogging, volumes]} - - /var/lib/kolla/config_files/barbican_keystone_listener.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/barbican:/var/lib/kolla/config_files/src:ro environment: *kolla_env - barbican_worker: start_order: 7 @@ -709,7 +709,7 @@ outputs: - {get_attr: [BarbicanApiLogging, volumes]} - - /var/lib/kolla/config_files/barbican_worker.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/barbican:/var/lib/kolla/config_files/src:ro - if: - thales_hsm_enabled diff --git a/deployment/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/cavium/liquidio-compute-config-container-puppet.yaml index 0319abb4e9..f7484f8fb6 100644 --- a/deployment/cavium/liquidio-compute-config-container-puppet.yaml +++ b/deployment/cavium/liquidio-compute-config-container-puppet.yaml @@ -116,7 +116,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/liquidio_config.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/liquidio/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/liquidio:/var/lib/kolla/config_files/src:ro - /etc/udev/:/etc/udev/:z - /usr/lib/udev/:/usr/lib/udev/:z - /lib/modules/:/lib/modules/:z diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index fd2ade0f42..5244c1ff41 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -126,7 +126,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ceilometer_agent_central.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro - /var/log/containers/ceilometer:/var/log/ceilometer:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index 383b2b6638..cf901de199 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml @@ -107,7 +107,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro - /var/run/libvirt:/var/run/libvirt:ro - /var/log/containers/ceilometer:/var/log/ceilometer:z environment: diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 08c211b1a1..9bfd60b125 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml @@ -127,7 +127,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index 555c0fc5d0..f7024c4824 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -113,7 +113,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ceilometer_agent_notification.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro - /var/log/containers/ceilometer:/var/log/ceilometer:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 45e2823529..0d4097a3e1 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -287,7 +287,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/cinder_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro - /var/log/containers/cinder:/var/log/cinder:z - /var/log/containers/httpd/cinder-api:/var/log/httpd:z - @@ -315,7 +315,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/cinder_api_cron.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro - /var/log/containers/cinder:/var/log/cinder:z - /var/log/containers/httpd/cinder-api:/var/log/httpd:z environment: diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index d27fe397d4..5f390151f8 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -185,7 +185,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro cinder_backup_init_bundle: start_order: 1 detach: false diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index b674538813..e2edfe3693 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/deployment/cinder/cinder-common-container-puppet.yaml @@ -150,7 +150,7 @@ outputs: - {get_param: CinderVolumeOptVolumes} - - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /lib/modules:/lib/modules:ro @@ -185,7 +185,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/cinder_backup.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /dev/:/dev/ diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 765f5d7424..b7398d49c6 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -124,7 +124,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/cinder_scheduler.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro - /var/log/containers/cinder:/var/log/cinder:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 7ff97a4f68..fa4490ed65 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -170,7 +170,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro cinder_volume_init_bundle: start_order: 1 detach: false diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index 0b1bf2ddef..04b066667b 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/deployment/database/mysql-container-puppet.yaml @@ -158,7 +158,7 @@ outputs: list_concat: - - /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json - - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/mysql:/var/lib/kolla/config_files/src:ro - /etc/localtime:/etc/localtime:ro - /etc/hosts:/etc/hosts:ro - /var/lib/mysql:/var/lib/mysql diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 7e6ac40890..ad8f3d03d7 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -234,7 +234,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:rw,z - - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro,z + - /var/lib/config-data/puppet-generated/mysql:/var/lib/kolla/config_files/src:ro,z - /var/lib/mysql:/var/lib/mysql:rw,z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS @@ -263,7 +263,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/mysql:/var/lib/kolla/config_files/src:ro mysql_init_bundle: start_order: 1 detach: false diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index e6601560e5..771a0b9858 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/deployment/database/redis-container-puppet.yaml @@ -175,7 +175,7 @@ outputs: volumes: - /run:/run - /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro - /etc/localtime:/etc/localtime:ro - /var/log/containers/redis:/var/log/redis:z - /var/run/redis:/var/run/redis:z @@ -196,7 +196,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/redis_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro - /etc/pki/tls/certs/redis.crt:/etc/pki/tls/certs/redis.crt:ro - /etc/pki/tls/private/redis.key:/etc/pki/tls/private/redis.key:ro environment: diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index b94a635324..aae59fe9b2 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -219,7 +219,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro - redis_init_bundle: start_order: 2 detach: false @@ -262,7 +262,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/redis_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro - /etc/pki/tls/certs/redis.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/redis.crt:ro - /etc/pki/tls/private/redis.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/redis.key:ro environment: diff --git a/deployment/etcd/etcd-container-puppet.yaml b/deployment/etcd/etcd-container-puppet.yaml index 2a219d6245..c734d92023 100644 --- a/deployment/etcd/etcd-container-puppet.yaml +++ b/deployment/etcd/etcd-container-puppet.yaml @@ -138,7 +138,7 @@ outputs: - /var/lib/etcd:/var/lib/etcd - /etc/localtime:/etc/localtime:ro - /var/lib/kolla/config_files/etcd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/etcd/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/etcd:/var/lib/kolla/config_files/src:ro environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS container_puppet_tasks: diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 5095269bf8..42a386b785 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/deployment/experimental/designate/designate-api-container-puppet.yaml @@ -149,7 +149,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/designate_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro - /var/log/containers/designate:/var/log/designate:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index 87f00a16e8..84f6a99163 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/deployment/experimental/designate/designate-central-container-puppet.yaml @@ -185,7 +185,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/designate_central.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro - /var/log/containers/designate:/var/log/designate:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index a6f3646f48..6952042035 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/deployment/experimental/designate/designate-mdns-container-puppet.yaml @@ -164,7 +164,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/designate_mdns.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro - /var/log/containers/designate:/var/log/designate:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index 3e32e4f61f..d8d0cbe19e 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/deployment/experimental/designate/designate-producer-container-puppet.yaml @@ -122,7 +122,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/designate_producer.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro - /var/log/containers/designate:/var/log/designate:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index 7981909922..c046e310ef 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/deployment/experimental/designate/designate-sink-container-puppet.yaml @@ -114,7 +114,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/designate_sink.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro - /var/log/containers/designate:/var/log/designate:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index b5ff0fbd99..84844904a6 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/deployment/experimental/designate/designate-worker-container-puppet.yaml @@ -199,7 +199,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/designate_worker.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro - /var/log/containers/designate:/var/log/designate:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS @@ -214,7 +214,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/designate_backend_bind9.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro - /var/log/containers/designate:/var/log/designate:z - /var/named-persistent:/var/named-persistent:z environment: diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index aaccae55f7..b768744af0 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -528,7 +528,7 @@ outputs: - {get_param: GlanceApiOptVolumes} - - /var/lib/kolla/config_files/glance_api.json:/var/lib/kolla/config_files/config.json - - /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/glance_api:/var/lib/kolla/config_files/src:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /var/lib/glance:/var/lib/glance:slave - @@ -575,7 +575,7 @@ outputs: - {get_attr: [GlanceLogging, volumes]} - - /var/lib/kolla/config_files/glance_api_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/glance_api:/var/lib/kolla/config_files/src:ro - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro environment: diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 763cabab62..8c6d8fc901 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -306,7 +306,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/gnocchi_db_sync.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro - str_replace: template: GNOCCHI_FILE_BASE_PATH:GNOCCHI_FILE_BASE_PATH:SE_FLAGS params: {GNOCCHI_FILE_BASE_PATH: {get_param: GnocchiFileBasePath}, SE_FLAGS: 'shared,z'} @@ -331,7 +331,7 @@ outputs: template: GNOCCHI_FILE_BASE_PATH:GNOCCHI_FILE_BASE_PATH:SE_FLAGS params: {GNOCCHI_FILE_BASE_PATH: {get_param: GnocchiFileBasePath}, SE_FLAGS: 'shared,z'} - /var/lib/kolla/config_files/gnocchi_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro - /var/log/containers/gnocchi:/var/log/gnocchi:z - /var/log/containers/httpd/gnocchi-api:/var/log/httpd:z - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index e2ca033c3b..f0098ae868 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml @@ -144,7 +144,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/gnocchi_metricd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro - /var/log/containers/gnocchi:/var/log/gnocchi:z - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - str_replace: diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index 1d4f55f6b2..d114b20346 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml @@ -136,7 +136,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/gnocchi_statsd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro - /var/log/containers/gnocchi:/var/log/gnocchi:z - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - str_replace: diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index f70a550caa..879866d57d 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -260,7 +260,7 @@ outputs: - {get_attr: [HAProxyLogging, volumes]} - - /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/haproxy:/var/lib/kolla/config_files/src:ro - /var/lib/haproxy:/var/lib/haproxy:rw,z - if: - public_tls_enabled diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index 7a13e515de..ba8dcfbab9 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -252,7 +252,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/haproxy:/var/lib/kolla/config_files/src:ro haproxy_init_bundle: start_order: 3 detach: false diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 3a0592581c..5f3a10f7a0 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -197,7 +197,7 @@ outputs: - {get_attr: [HeatApiCfnLogging, volumes]} - - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/heat_api_cfn/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/heat_api_cfn:/var/lib/kolla/config_files/src:ro - if: - internal_tls_enabled diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 1a852fbb22..bb2bc7bbd2 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -225,7 +225,7 @@ outputs: - {get_param: HeatApiOptVolumes} - - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/heat_api:/var/lib/kolla/config_files/src:ro - if: - internal_tls_enabled @@ -254,7 +254,7 @@ outputs: - {get_attr: [HeatApiLogging, volumes]} - - /var/lib/kolla/config_files/heat_api_cron.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/heat_api:/var/lib/kolla/config_files/src:ro environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: {get_attr: [HeatApiLogging, host_prep_tasks]} diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index df09f1c1db..d42bc313e4 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/deployment/heat/heat-engine-container-puppet.yaml @@ -275,7 +275,7 @@ outputs: - {get_param: HeatEngineOptVolumes} - - /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/heat/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/heat:/var/lib/kolla/config_files/src:ro environment: map_merge: - {get_param: HeatEngineOptEnvVars} diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 7db8eb3674..e835c40ca7 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -270,7 +270,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/horizon.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/horizon/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/horizon:/var/lib/kolla/config_files/src:ro - /var/log/containers/horizon:/var/log/horizon:z - /var/log/containers/httpd/horizon:/var/log/httpd:z - /var/tmp/:/var/tmp/:z diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index b45c2ca65d..53403420ca 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -244,7 +244,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ironic_api/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ironic_api:/var/lib/kolla/config_files/src:ro - /var/log/containers/ironic:/var/log/ironic:z - /var/log/containers/httpd/ironic-api:/var/log/httpd:z - diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 21e2edf564..662b3f840c 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -532,7 +532,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ironic:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /sys:/sys - /dev:/dev diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 9e06258c3a..296a672e96 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.yaml @@ -447,7 +447,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ironic_inspector.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ironic_inspector/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ironic_inspector:/var/lib/kolla/config_files/src:ro - /var/lib/ironic:/var/lib/ironic:shared,z - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared,z @@ -467,7 +467,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ironic_inspector_dnsmasq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ironic_inspector/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ironic_inspector:/var/lib/kolla/config_files/src:ro - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared,z environment: diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index 92af478269..1995e5e8fd 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml @@ -115,7 +115,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/ironic_neutron_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]} diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 8d272ed5b1..80ffeedf49 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -133,7 +133,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ironic:/var/lib/kolla/config_files/src:ro - /var/lib/ironic:/var/lib/ironic/:shared,z - /var/log/containers/ironic:/var/log/ironic:z - /var/log/containers/httpd/ironic-pxe:/var/log/httpd:z @@ -153,7 +153,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/ironic:/var/lib/kolla/config_files/src:ro - /var/lib/ironic:/var/lib/ironic/:shared,z - /var/log/containers/ironic:/var/log/ironic:z - /var/log/containers/httpd/ironic-pxe:/var/log/httpd:z diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 02378171b9..24da4e9491 100644 --- a/deployment/keepalived/keepalived-container-puppet.yaml +++ b/deployment/keepalived/keepalived-container-puppet.yaml @@ -122,7 +122,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/keepalived.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/keepalived/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/keepalived:/var/lib/kolla/config_files/src:ro - /var/log/containers/keepalived/:/var/log/:z - /lib/modules/:/lib/modules/:ro - /var/lib/haproxy/:/var/lib/haproxy/:z diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index a5d6c560af..047b5b3003 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -641,7 +641,7 @@ outputs: - {get_attr: [KeystoneLogging, volumes]} - - /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/keystone/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/keystone:/var/lib/kolla/config_files/src:ro - if: - internal_tls_enabled diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index 9fd546a2f0..955b04e23f 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/deployment/logging/rsyslog-container-puppet.yaml @@ -209,7 +209,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/rsyslog.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rsyslog/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rsyslog:/var/lib/kolla/config_files/src:ro - /var/log/containers:/var/log/containers:ro - /var/log/containers/rsyslog:/var/log/rsyslog:rw,z - /var/lib/rsyslog.container:/var/lib/rsyslog:rw,z diff --git a/deployment/logging/stdout/haproxy.yaml b/deployment/logging/stdout/haproxy.yaml index a599c19917..49f03369f4 100644 --- a/deployment/logging/stdout/haproxy.yaml +++ b/deployment/logging/stdout/haproxy.yaml @@ -24,7 +24,7 @@ outputs: restart: always volumes: - /var/lib/kolla/config_files/rsyslog_sidecar.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rsyslog_sidecar/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rsyslog_sidecar:/var/lib/kolla/config_files/src:ro - HAProxyLogs:/sockets/ environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index 8ca58967ac..5cf8894cf1 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/deployment/logrotate/logrotate-crond-container-puppet.yaml @@ -151,7 +151,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/logrotate-crond.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/crond/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/crond:/var/lib/kolla/config_files/src:ro - /var/log/containers:/var/log/containers:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index c67ce3346a..47450ff212 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -219,7 +219,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/manila_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro - /var/log/containers/manila:/var/log/manila:z - /var/log/containers/httpd/manila-api:/var/log/httpd:z - if: diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 6eaff75f61..5b134a550b 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -98,7 +98,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/manila_scheduler.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro - /var/log/containers/manila:/var/log/manila:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml index 324a0b0b6f..54b5df5742 100644 --- a/deployment/manila/manila-share-common.yaml +++ b/deployment/manila/manila-share-common.yaml @@ -56,7 +56,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/manila_share.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /dev/:/dev/ - /run/:/run/ diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index e93db13971..07f9cfce40 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -153,7 +153,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro manila_share_init_bundle: start_order: 1 detach: false diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index 30cfad85c6..f0cead07ea 100644 --- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml +++ b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml @@ -137,7 +137,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/qdrouterd/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro - /var/lib/qdrouterd:/var/lib/qdrouterd:z - /var/log/containers/qdrouterd:/var/log/qdrouterd:z environment: diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 9d0156898f..3037589ed3 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-container-puppet.yaml @@ -628,7 +628,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/collectd/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/collectd:/var/lib/kolla/config_files/src:ro - /var/log/containers/collectd:/var/log/collectd:rw,z - /var/run/:/var/run:rw,z - /var/log/journal:/var/log/journal:ro diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index 9c00d958fa..fa05b7bf5d 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -286,7 +286,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/metrics-qdr.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/metrics-qdr/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/metrics-qdr:/var/lib/kolla/config_files/src:ro - /var/lib/metrics-qdr:/var/lib/qdrouterd:z - /var/log/containers/metrics-qdr:/var/log/qdrouterd:z - if: diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index 118547c81e..46b80ba75f 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/deployment/mistral/mistral-api-container-puppet.yaml @@ -194,7 +194,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - /var/log/containers/mistral:/var/log/mistral:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index 21123299c1..cf6b5d22a7 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-engine-container-puppet.yaml @@ -124,7 +124,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - /var/log/containers/mistral:/var/log/mistral:z - /var/lib/mistral:/var/lib/mistral:ro - /usr/share/ansible/:/usr/share/ansible/:ro diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index 21dfcd82ec..338487d52b 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-event-engine-container-puppet.yaml @@ -99,7 +99,7 @@ outputs: - - /run:/run - /var/lib/kolla/config_files/mistral_event_engine.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - /var/log/containers/mistral:/var/log/mistral:z - /var/lib/mistral:/var/lib/mistral:ro - /usr/share/ansible/:/usr/share/ansible/:ro diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index 1c54226ed4..d9f1e62e58 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/mistral/mistral-executor-container-puppet.yaml @@ -167,7 +167,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro - /run:/run - /var/log/containers/mistral:/var/log/mistral:z - /var/lib/mistral:/var/lib/mistral:z diff --git a/deployment/multipathd/multipathd-container.yaml b/deployment/multipathd/multipathd-container.yaml index c2d3b6af7d..6e0354613c 100644 --- a/deployment/multipathd/multipathd-container.yaml +++ b/deployment/multipathd/multipathd-container.yaml @@ -123,7 +123,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/multipathd/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/multipathd:/var/lib/kolla/config_files/src:ro - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro - /dev/:/dev/ - /run/:/run/ diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 1657a60502..04c8b84b4c 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -486,7 +486,7 @@ outputs: - {get_param: NeutronApiOptVolumes} - - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - if: - ovn_and_tls - @@ -510,7 +510,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/neutron_server_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro environment: diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 9b023aab62..269cecdf48 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml @@ -362,7 +362,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run/openvswitch:/run/openvswitch:shared,z - /var/lib/neutron:/var/lib/neutron:shared,z diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index 4b8adb85c7..7398a9bfd4 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/deployment/neutron/neutron-l3-container-puppet.yaml @@ -320,7 +320,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/neutron_l3_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run/openvswitch:/run/openvswitch:shared,z - /var/lib/neutron:/var/lib/neutron:shared,z diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index 9370917a84..21d28b0720 100644 --- a/deployment/neutron/neutron-metadata-container-puppet.yaml +++ b/deployment/neutron/neutron-metadata-container-puppet.yaml @@ -189,7 +189,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/neutron_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /var/lib/neutron:/var/lib/neutron:shared,z environment: diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml index 6cc3bd168c..34caff938e 100644 --- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml @@ -166,7 +166,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/neutron_mlnx_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro - /var/lib/config-data/puppet-generated/neutron/etc/neutron:/etc/neutron @@ -188,7 +188,7 @@ outputs: - {get_attr: [MlnxAgentLogging, volumes]} - - /var/lib/kolla/config_files/neutron_mlnx_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run:/run - /sys/class/net:/sys/class/net:rw @@ -208,7 +208,7 @@ outputs: - {get_attr: [EswitchdLogging, volumes]} - - /var/lib/kolla/config_files/eswitchd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run:/run - /sys/class/net:/sys/class/net:rw diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index bde60ac41e..5b66c68fb6 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -293,7 +293,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run/openvswitch:/run/openvswitch:shared,z - /var/run/openvswitch/:/var/run/openvswitch/:shared,z @@ -323,7 +323,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /var/lib/container-config-scripts/neutron_ovs_agent_launcher.sh:/neutron_ovs_agent_launcher.sh:ro - /lib/modules:/lib/modules:ro - /run/openvswitch:/run/openvswitch:shared,z diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index 96fffc9b08..9ceebe8d5b 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml @@ -192,7 +192,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/neutron_sriov_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run:/run - /sys/class/net:/sys/class/net:rw diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 74aefa65eb..2c36b435e4 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -381,7 +381,7 @@ outputs: list_concat: - *nova_api_bootstrap_volumes - - - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro - /var/lib/container-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro user: root command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_default_cell.sh" @@ -401,7 +401,7 @@ outputs: - {get_attr: [NovaApiLogging, volumes]} - - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro - if: - internal_tls_enabled @@ -451,7 +451,7 @@ outputs: - {get_attr: [NovaApiLogging, volumes]} - - /var/lib/kolla/config_files/nova_api_cron.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS metadata_settings: diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index cb09caf5c3..da8550f139 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -699,7 +699,7 @@ outputs: - {get_param: NovaComputeOptVolumes} - - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /dev:/dev diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index d0d4cf80cc..d546bbc7bc 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -185,7 +185,7 @@ outputs: - {get_attr: [NovaLogging, volumes]} - - /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS deploy_steps_tasks: diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index e50479d4db..67303e7422 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -178,7 +178,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro - /run:/run - /dev:/dev diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index 7e08aec899..2751a9aa85 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-container-puppet.yaml @@ -652,7 +652,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/nova_virtlogd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /dev:/dev - /run:/run @@ -690,7 +690,7 @@ outputs: - {get_attr: [NovaLibvirtLogging, volumes]} - - /var/lib/kolla/config_files/nova_libvirt.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - /lib/modules:/lib/modules:ro - /dev:/dev diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 20c50c5fbe..11eb4d4d9b 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -233,7 +233,7 @@ outputs: - {get_attr: [NovaMetadataLogging, volumes]} - - /var/lib/kolla/config_files/nova_metadata.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova_metadata/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova_metadata:/var/lib/kolla/config_files/src:ro - if: - internal_tls_enabled diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index c6ac2d359c..27631dc9ac 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -159,7 +159,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/nova-migration-target.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro - /etc/ssh/:/host-ssh/:ro - /run/libvirt:/run/libvirt # podman fails to relable if nova_nfs_enabled where we have diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index 40562f817c..77590c215a 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-scheduler-container-puppet.yaml @@ -182,7 +182,7 @@ outputs: - {get_attr: [NovaLogging, volumes]} - - /var/lib/kolla/config_files/nova_scheduler.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro - /run:/run environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index b730e6ba64..5a3e381cde 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -251,7 +251,7 @@ outputs: - {get_attr: [NovaLogging, volumes]} - - /var/lib/kolla/config_files/nova_vnc_proxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro - if: - use_tls_for_vnc diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index 9807c95c43..00ce62ee77 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -297,7 +297,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/octavia_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/octavia/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro - /var/log/containers/octavia:/var/log/octavia:z - /var/run/octavia:/var/run/octavia:shared,z - /var/log/containers/httpd/octavia-api:/var/log/httpd:z @@ -326,7 +326,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/octavia_driver_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/octavia/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro - /var/log/containers/octavia:/var/log/octavia:z - /var/run/octavia:/var/run/octavia:shared,z environment: diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 0e03f77ba8..a667d2ea04 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -143,7 +143,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/octavia_health_manager.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/octavia/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro - /var/log/containers/octavia:/var/log/octavia:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index 6411c8b5c0..1e96fbb47e 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -142,7 +142,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/octavia_housekeeping.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/octavia/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro - /var/log/containers/octavia:/var/log/octavia:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 25e7182d42..f516f13441 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -129,7 +129,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/octavia_worker.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/octavia/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro - /var/log/containers/octavia:/var/log/octavia:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 971b96d2b4..a25e9bb1d0 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -314,7 +314,7 @@ outputs: - {get_attr: [NeutronLogging, volumes]} - - /var/lib/kolla/config_files/ovn_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run/openvswitch:/run/openvswitch:shared,z - /var/lib/neutron:/var/lib/neutron:shared,z diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index c5fda8003a..821f1ae468 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/deployment/pacemaker/clustercheck-container-puppet.yaml @@ -86,7 +86,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/clustercheck.json:/var/lib/kolla/config_files/config.json - - /var/lib/config-data/puppet-generated/clustercheck/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/clustercheck:/var/lib/kolla/config_files/src:ro - /var/lib/mysql:/var/lib/mysql environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index df730534ea..e24f5c6bf1 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -281,7 +281,7 @@ outputs: - {get_attr: [PlacementLogging, volumes]} - - /var/lib/kolla/config_files/placement_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/placement/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/placement:/var/lib/kolla/config_files/src:ro - if: - internal_tls_enabled diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index c4ea175552..1f01b2be8f 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/deployment/qdr/qdrouterd-container-puppet.yaml @@ -127,7 +127,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/qdrouterd/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro - /var/lib/qdrouterd:/var/lib/qdrouterd:z - /var/log/containers/qdrouterd:/var/log/qdrouterd:z environment: diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index a47c5da8c0..d2f77d85c4 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml @@ -268,7 +268,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /var/lib/rabbitmq:/var/lib/rabbitmq - /var/log/containers/rabbitmq:/var/log/rabbitmq - if: @@ -302,7 +302,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z - /var/log/containers/rabbitmq:/var/log/rabbitmq:z - if: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index a18d7a16cf..20fa19db2f 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml @@ -212,7 +212,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z - /var/log/containers/rabbitmq:/var/log/rabbitmq:z - if: @@ -247,7 +247,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z - /var/log/containers/rabbitmq:/var/log/rabbitmq:z - if: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 1640b33c9d..5b981e833c 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -161,7 +161,7 @@ outputs: privileged: false volumes: - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /etc/hosts:/etc/hosts:ro - /etc/localtime:/etc/localtime:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z @@ -192,7 +192,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro rabbitmq_init_bundle: start_order: 1 detach: false diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 02034cb6fe..e18b735c76 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -161,7 +161,7 @@ outputs: privileged: false volumes: - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /etc/hosts:/etc/hosts:ro - /etc/localtime:/etc/localtime:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z @@ -192,7 +192,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro rabbitmq_init_bundle: start_order: 1 detach: false diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 4611b15507..d727820ae6 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml @@ -212,7 +212,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z - /var/log/containers/rabbitmq:/var/log/rabbitmq:z - if: @@ -247,7 +247,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z - /var/log/containers/rabbitmq:/var/log/rabbitmq:z - if: diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index ebd094dafb..1a11100a7d 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -161,7 +161,7 @@ outputs: privileged: false volumes: - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro - /etc/hosts:/etc/hosts:ro - /etc/localtime:/etc/localtime:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:z @@ -193,7 +193,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, pacemaker_restart_volumes]} - - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro rabbitmq_init_bundle: start_order: 1 detach: false diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index 816a1179a4..24a3ba1c33 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/deployment/sahara/sahara-api-container-puppet.yaml @@ -185,7 +185,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/sahara-api.json:/var/lib/kolla/config_files/config.json - - /var/lib/config-data/puppet-generated/sahara/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/sahara:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /var/lib/sahara:/var/lib/sahara - /var/log/containers/sahara:/var/log/sahara diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index 0194f5a20b..86abf484f5 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/deployment/sahara/sahara-engine-container-puppet.yaml @@ -115,7 +115,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/sahara-engine.json:/var/lib/kolla/config_files/config.json - - /var/lib/config-data/puppet-generated/sahara/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/sahara:/var/lib/kolla/config_files/src:ro - /var/lib/sahara:/var/lib/sahara - /var/log/containers/sahara:/var/log/sahara environment: diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 248bce52b7..324a1df184 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -403,7 +403,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /run:/run - /srv/node:/srv/node - /dev:/dev @@ -422,7 +422,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_proxy_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro environment: diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 2a56322639..c9182a648a 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -320,7 +320,7 @@ outputs: detach: false command: ['/bin/bash', '-c', 'sed -i "/pid file/d" /var/lib/kolla/config_files/src/etc/rsyncd.conf'] volumes: - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:rw,z + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:rw,z step_4: map_merge: - if: @@ -337,7 +337,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node:z - /dev:/dev - /var/cache/swift:/var/cache/swift:z @@ -354,7 +354,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -370,7 +370,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -386,7 +386,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -403,7 +403,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -419,7 +419,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -436,7 +436,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node:z - /dev:/dev - /var/cache/swift:/var/cache/swift:z @@ -454,7 +454,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -470,7 +470,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -488,7 +488,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -504,7 +504,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -520,7 +520,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -538,7 +538,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift @@ -555,7 +555,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_rsync.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/log/containers/swift:/var/log/swift:z @@ -574,7 +574,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/swift_container_sharder.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro - /srv/node:/srv/node - /dev:/dev - /var/cache/swift:/var/cache/swift diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 2871c40826..ce7e40f3ae 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -327,7 +327,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/zaqar/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro - /var/log/containers/zaqar:/var/log/zaqar - /var/log/containers/httpd/zaqar:/var/log/httpd - @@ -358,7 +358,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/zaqar/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro - /var/log/containers/zaqar:/var/log/zaqar - /var/log/containers/httpd/zaqar:/var/log/httpd environment: