Browse Source

Merge "Sync httpd conf.modules.d configs" into stable/train

changes/70/738170/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
4404b1e323
19 changed files with 137 additions and 0 deletions
  1. +7
    -0
      deployment/aodh/aodh-api-container-puppet.yaml
  2. +7
    -0
      deployment/barbican/barbican-api-container-puppet.yaml
  3. +7
    -0
      deployment/cinder/cinder-api-container-puppet.yaml
  4. +7
    -0
      deployment/glance/glance-api-container-puppet.yaml
  5. +7
    -0
      deployment/gnocchi/gnocchi-api-container-puppet.yaml
  6. +7
    -0
      deployment/heat/heat-api-cfn-container-puppet.yaml
  7. +7
    -0
      deployment/heat/heat-api-container-puppet.yaml
  8. +7
    -0
      deployment/horizon/horizon-container-puppet.yaml
  9. +7
    -0
      deployment/ironic/ironic-api-container-puppet.yaml
  10. +7
    -0
      deployment/ironic/ironic-pxe-container-puppet.yaml
  11. +7
    -0
      deployment/keystone/keystone-container-puppet.yaml
  12. +7
    -0
      deployment/manila/manila-api-container-puppet.yaml
  13. +7
    -0
      deployment/neutron/neutron-api-container-puppet.yaml
  14. +7
    -0
      deployment/nova/nova-api-container-puppet.yaml
  15. +7
    -0
      deployment/nova/nova-metadata-container-puppet.yaml
  16. +7
    -0
      deployment/octavia/octavia-api-container-puppet.yaml
  17. +11
    -0
      deployment/placement/placement-api-container-puppet.yaml
  18. +7
    -0
      deployment/swift/swift-proxy-container-puppet.yaml
  19. +7
    -0
      deployment/zaqar/zaqar-container-puppet.yaml

+ 7
- 0
deployment/aodh/aodh-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/barbican/barbican-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/cinder/cinder-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/glance/glance-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/gnocchi/gnocchi-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/heat/heat-api-cfn-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/heat/heat-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/horizon/horizon-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/ironic/ironic-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/ironic/ironic-pxe-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/keystone/keystone-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/manila/manila-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/neutron/neutron-api-container-puppet.yaml View File

@@ -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]}


+ 7
- 0
deployment/nova/nova-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/nova/nova-metadata-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/octavia/octavia-api-container-puppet.yaml View File

@@ -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


+ 11
- 0
deployment/placement/placement-api-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/swift/swift-proxy-container-puppet.yaml View File

@@ -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


+ 7
- 0
deployment/zaqar/zaqar-container-puppet.yaml View File

@@ -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


Loading…
Cancel
Save