diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index de809b10dd..941a933bb2 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -151,6 +151,10 @@ outputs: /var/lib/kolla/config_files/aodh_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/*" dest: "/" merge: true diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 1b23a6ce95..d58743307b 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -224,6 +224,10 @@ outputs: /var/lib/kolla/config_files/cinder_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/*" dest: "/" merge: true diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 4b328c7c65..1f73f50de5 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -449,6 +449,10 @@ outputs: /var/lib/kolla/config_files/glance_api_tls_proxy.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/*" dest: "/" merge: true diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 347b19993a..49a33dcdbf 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -167,6 +167,10 @@ outputs: /var/lib/kolla/config_files/heat_api_cfn.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/*" dest: "/" merge: true diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 249ee349fd..47ace4bfc9 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -183,6 +183,10 @@ outputs: /var/lib/kolla/config_files/heat_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/*" dest: "/" merge: true diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 7409e86c27..82414ff8d1 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -193,6 +193,10 @@ outputs: /var/lib/kolla/config_files/ironic_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/*" dest: "/" merge: true diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 1694790225..94c52e0c08 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -63,6 +63,10 @@ outputs: /var/lib/kolla/config_files/ironic_pxe_http.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/*" dest: "/" merge: true diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index d3d4229a8e..a3150dae86 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -691,6 +691,14 @@ outputs: dest: "/etc/keystone/fernet-keys" merge: false preserve_properties: true + - 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" + 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 12013a54e0..5b5f8ac124 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -256,6 +256,10 @@ outputs: /var/lib/kolla/config_files/zaqar.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/*" dest: "/" merge: true diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index 1981d26b40..1b8960ee67 100644 --- a/docker/services/barbican-api.yaml +++ b/docker/services/barbican-api.yaml @@ -171,6 +171,10 @@ outputs: /var/lib/kolla/config_files/barbican_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/*" dest: "/" merge: true diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 40ed73f81b..35d60de507 100644 --- a/docker/services/ec2-api.yaml +++ b/docker/services/ec2-api.yaml @@ -105,6 +105,10 @@ outputs: /var/lib/kolla/config_files/ec2_api_tls_proxy.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/*" dest: "/" merge: true diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml index 7c987f0630..147b3ed8be 100644 --- a/docker/services/gnocchi-api.yaml +++ b/docker/services/gnocchi-api.yaml @@ -113,6 +113,10 @@ outputs: /var/lib/kolla/config_files/gnocchi_api.json: command: /usr/sbin/httpd -DFOREGROUND config_files: &gnocchi_api_kolla_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/*" dest: "/" merge: true diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml index 09f31e03a3..947a1faef5 100644 --- a/docker/services/horizon.yaml +++ b/docker/services/horizon.yaml @@ -76,6 +76,10 @@ outputs: /var/lib/kolla/config_files/horizon.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/*" dest: "/" merge: true diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index 1cd22f7415..f53f25c846 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -130,6 +130,10 @@ outputs: /var/lib/kolla/config_files/neutron_server_tls_proxy.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/*" dest: "/" merge: true diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index 0600cfda7e..3f00280ea8 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -130,6 +130,10 @@ outputs: /var/lib/kolla/config_files/nova_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/*" dest: "/" merge: true diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml index 0b90f3b031..0d3526dcd6 100644 --- a/docker/services/nova-metadata.yaml +++ b/docker/services/nova-metadata.yaml @@ -120,6 +120,10 @@ outputs: /var/lib/kolla/config_files/nova_metadata.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/*" dest: "/" merge: true diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 1d21902a0e..264de06e45 100644 --- a/docker/services/nova-placement.yaml +++ b/docker/services/nova-placement.yaml @@ -106,6 +106,10 @@ outputs: /var/lib/kolla/config_files/nova_placement.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/*" dest: "/" merge: true diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml index f0dfbfd311..6b04221c1e 100644 --- a/docker/services/octavia-api.yaml +++ b/docker/services/octavia-api.yaml @@ -120,6 +120,10 @@ outputs: /var/lib/kolla/config_files/octavia_api_tls_proxy.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/*" dest: "/" merge: true diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml index b4801543e0..665e4470ca 100644 --- a/docker/services/panko-api.yaml +++ b/docker/services/panko-api.yaml @@ -92,6 +92,10 @@ outputs: /var/lib/kolla/config_files/panko_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/*" dest: "/" merge: true diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index afdda44405..a7009304ea 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -99,6 +99,10 @@ outputs: /var/lib/kolla/config_files/swift_proxy_tls_proxy.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/*" dest: "/" merge: true diff --git a/docker/services/tripleo-ui.yaml b/docker/services/tripleo-ui.yaml index 756b3a0610..eade715f8c 100644 --- a/docker/services/tripleo-ui.yaml +++ b/docker/services/tripleo-ui.yaml @@ -87,6 +87,10 @@ outputs: /var/lib/kolla/config_files/tripleo_ui.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/*" dest: "/" merge: true