diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 8d83062428..8b05844a29 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -216,9 +216,6 @@ outputs: 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/*" diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 258d59ef3a..0543c37c85 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -324,9 +324,6 @@ outputs: 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/*" diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index abd7bf13eb..694191f73f 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -233,9 +233,6 @@ outputs: 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/*" diff --git a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml index 6758915035..a208598feb 100644 --- a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml +++ b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml @@ -276,9 +276,6 @@ outputs: 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/*" diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 3725008ee9..b538cc9880 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -606,9 +606,6 @@ outputs: 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/*" diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 8493a40c46..4e7d5c3091 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -260,9 +260,6 @@ outputs: 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/*" diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index a8c328e78b..ce0779f1ef 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -165,9 +165,6 @@ outputs: 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/*" diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 6a59b9f579..e601161cf2 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -195,9 +195,6 @@ outputs: 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/*" diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 3a505964a7..03d7f7eaab 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -260,9 +260,6 @@ outputs: 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/*" diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 8c5ce81e1b..3b56a51efe 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -202,9 +202,6 @@ outputs: 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/*" diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index ce3ec2b51f..3401935b54 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -61,9 +61,6 @@ outputs: 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/*" diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 9c27a3be5d..b6370eaf76 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -642,9 +642,6 @@ outputs: 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/*" diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 88ccbb92d5..ba8ce647ed 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -233,9 +233,6 @@ outputs: 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/*" diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 88a47c0676..57f305ac81 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -456,9 +456,6 @@ outputs: 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: diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 063f2d99c9..37f2590db4 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -433,9 +433,6 @@ outputs: 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/*" diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index afa8c0f950..8347565a51 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -219,9 +219,6 @@ outputs: 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/*" diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index 0fccdf2aa5..e0b294f4d9 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -248,9 +248,6 @@ outputs: 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/*" diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index 07c04c4628..56276a1617 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -214,9 +214,6 @@ outputs: 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/*" diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index ac5fadb8b7..4daddc2138 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -293,9 +293,6 @@ outputs: 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/*"