Merge "Sync httpd conf.modules.d configs" into stable/train
This commit is contained in:
commit
4404b1e323
|
@ -176,6 +176,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -310,6 +310,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -263,6 +263,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -583,6 +583,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -237,6 +237,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -171,6 +171,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -201,6 +201,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -226,6 +226,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -211,6 +211,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -63,6 +63,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -619,6 +619,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -182,6 +182,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -450,6 +450,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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:
|
container_config_scripts:
|
||||||
map_merge:
|
map_merge:
|
||||||
- {get_attr: [ContainersCommon, container_config_scripts]}
|
- {get_attr: [ContainersCommon, container_config_scripts]}
|
||||||
|
|
|
@ -269,6 +269,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -200,6 +200,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -251,6 +251,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -196,6 +196,17 @@ outputs:
|
||||||
/var/lib/kolla/config_files/placement_api.json:
|
/var/lib/kolla/config_files/placement_api.json:
|
||||||
command: /usr/sbin/httpd -DFOREGROUND
|
command: /usr/sbin/httpd -DFOREGROUND
|
||||||
config_files:
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -289,6 +289,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
|
@ -268,6 +268,13 @@ outputs:
|
||||||
dest: "/etc/httpd/conf.d"
|
dest: "/etc/httpd/conf.d"
|
||||||
merge: false
|
merge: false
|
||||||
preserve_properties: true
|
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/*"
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
|
|
Loading…
Reference in New Issue