diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 6ed6e89f02..5b0e1add6d 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -176,6 +176,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 5660da313a..4787c4e22f 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -310,6 +310,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 3c29f21525..75304dbea0 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -263,6 +263,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 957f5cfa05..db1ada0c59 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -583,6 +583,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 2979cd03b6..7826246a6b 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -237,6 +237,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index d692bfaaeb..d4b8cc712e 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -171,6 +171,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index bf10d552de..7797256e41 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -201,6 +201,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 488196d3ba..8e4062f630 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -226,6 +226,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index e58ef8aa73..d2f4a28502 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -211,6 +211,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 91ccf4a2de..28f4decf74 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -63,6 +63,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index fffe6b4d2a..dbcf8017db 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -619,6 +619,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index a625ce30d1..82e407c3e1 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -182,6 +182,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 3a8f876c41..4c9e219bf3 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -450,6 +450,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true container_config_scripts: map_merge: - {get_attr: [ContainersCommon, container_config_scripts]} diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 9bff9de9de..1b7010a0a3 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -269,6 +269,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index a566594ec9..7bf022e3ee 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -200,6 +200,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index c782509fa3..7ba4c3cb73 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -251,6 +251,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index 73cabfc28e..89c4392919 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -196,6 +196,17 @@ outputs: /var/lib/kolla/config_files/placement_api.json: command: /usr/sbin/httpd -DFOREGROUND config_files: + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.d" + dest: "/etc/httpd/conf.d" + merge: false + preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index d43bbc48a9..cc3b93bf25 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -289,6 +289,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 5f791c5c83..a3c086f6c0 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -268,6 +268,13 @@ outputs: dest: "/etc/httpd/conf.d" merge: false preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" + dest: "/etc/httpd/conf.modules.d" + # TODO(emilien) remove optional flag once we get a promotion + # https://launchpad.net/bugs/1884115 + optional: true + merge: false + preserve_properties: true - source: "/var/lib/kolla/config_files/src/*" dest: "/" merge: true