diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 55eb44c623..fbe724e6da 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 66f7574110..af4d42806f 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -326,6 +326,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 71a04f9cb9..b8b5c3c924 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -252,6 +252,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 79d397c46c..838d67d885 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -594,6 +594,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 1cf07adfa5..ba5dfc8fc9 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -243,6 +243,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 e6237dd9c4..14e9735f56 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 078ff519e3..0e8c83401b 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 f0d19f169d..c72683e1ed 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -249,6 +249,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 e546631865..1cbbf7f318 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -206,6 +206,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 1cf23f8f66..16dff6e1b2 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 192cfe853d..2fbf06d26e 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -647,6 +647,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 e252fb42cd..b1bf28fd95 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -183,6 +183,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 8b51c0d2a6..3140a5c9df 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -468,6 +468,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 docker_config: step_2: get_attr: [NeutronLogging, docker_config, step_2] diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 46eb118cb9..38798b491a 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -272,6 +272,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 6c45d2e3ce..a686b2a2ca 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -198,6 +198,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 5357b4c78d..d6499a39b3 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 2b81546557..27de541d17 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -212,6 +212,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 5904bd3ba2..8ed328cef2 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -291,6 +291,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 5f751b8567..e38c2e4d3e 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -280,6 +280,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