Merge "Don't use *-dist.conf files in commands"

This commit is contained in:
Zuul 2021-09-23 13:27:41 +00:00 committed by Gerrit Code Review
commit 760ede2fa8
22 changed files with 27 additions and 25 deletions

View File

@ -232,7 +232,7 @@ outputs:
config_image: {get_param: ContainerCinderConfigImage} config_image: {get_param: ContainerCinderConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/cinder_backup.json: /var/lib/kolla/config_files/cinder_backup.json:
command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf command: /usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf
config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]} config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]} permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
docker_config: docker_config:

View File

@ -150,7 +150,7 @@ outputs:
config_image: {get_param: ContainerCinderConfigImage} config_image: {get_param: ContainerCinderConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/cinder_backup.json: /var/lib/kolla/config_files/cinder_backup.json:
command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf command: /usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf
config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]} config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]} permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]} container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}

View File

@ -88,7 +88,7 @@ outputs:
config_image: {get_param: ContainerCinderConfigImage} config_image: {get_param: ContainerCinderConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/cinder_scheduler.json: /var/lib/kolla/config_files/cinder_scheduler.json:
command: /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf command: /usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -301,7 +301,7 @@ outputs:
config_image: {get_param: ContainerCinderConfigImage} config_image: {get_param: ContainerCinderConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/cinder_volume.json: /var/lib/kolla/config_files/cinder_volume.json:
command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf command: /usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf
config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]} config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]} permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
docker_config: docker_config:

View File

@ -106,7 +106,7 @@ outputs:
- tripleo::profile::base::lvm::enable_udev: false - tripleo::profile::base::lvm::enable_udev: false
tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image: &cinder_volume_image_pcmklatest tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image: &cinder_volume_image_pcmklatest
if: if:
- {get_param: ClusterFullTag} - {get_param: ClusterFullTag}
- "cluster.common.tag/cinder-volume:pcmklatest" - "cluster.common.tag/cinder-volume:pcmklatest"
- yaql: - yaql:
data: data:
@ -139,7 +139,7 @@ outputs:
config_image: {get_param: ContainerCinderConfigImage} config_image: {get_param: ContainerCinderConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/cinder_volume.json: /var/lib/kolla/config_files/cinder_volume.json:
command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf command: /usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf
config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]} config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]} permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]} container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}

View File

@ -449,7 +449,11 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [TLSProxyBase, role_data, config_settings] - get_attr: [TLSProxyBase, role_data, config_settings]
- glance::api::db::database_connection: # Set this for glance as it does not have a default
- glance::config::api_config:
paste_deploy/config_file:
value: '/etc/glance/glance-api-paste.ini'
glance::api::db::database_connection:
make_url: make_url:
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
username: glance username: glance
@ -628,7 +632,7 @@ outputs:
config_image: {get_param: ContainerGlanceApiConfigImage} config_image: {get_param: ContainerGlanceApiConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/glance_api.json: /var/lib/kolla/config_files/glance_api.json:
command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf --config-file /etc/glance/glance-image-import.conf command: /usr/bin/glance-api --config-file /etc/glance/glance-api.conf --config-file /etc/glance/glance-image-import.conf
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -220,7 +220,7 @@ outputs:
command: command:
list_join: list_join:
- ' ' - ' '
- - /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf - - /usr/bin/heat-engine --config-file /etc/heat/heat.conf
- get_attr: [HeatEngineLogging, cmd_extra_args] - get_attr: [HeatEngineLogging, cmd_extra_args]
config_files: &heat_engine_config_files config_files: &heat_engine_config_files
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"

View File

@ -400,7 +400,7 @@ outputs:
- /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:z - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:z
kolla_config: kolla_config:
/var/lib/kolla/config_files/ironic_inspector.json: /var/lib/kolla/config_files/ironic_inspector.json:
command: /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector-dist.conf --config-file /etc/ironic-inspector/inspector.conf command: /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector.conf
config_files: &ironic_inspector_config_files config_files: &ironic_inspector_config_files
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -112,7 +112,7 @@ outputs:
config_image: {get_param: ContainerNeutronConfigImage} config_image: {get_param: ContainerNeutronConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/ironic_neutron_agent.json: /var/lib/kolla/config_files/ironic_neutron_agent.json:
command: /usr/bin/ironic-neutron-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ironic_neutron_agent.ini --config-dir /etc/neutron/conf.d/common command: /usr/bin/ironic-neutron-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ironic_neutron_agent.ini --config-dir /etc/neutron/conf.d/common
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -71,7 +71,7 @@ outputs:
config_image: {get_param: ContainerManilaConfigImage} config_image: {get_param: ContainerManilaConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/manila_scheduler.json: /var/lib/kolla/config_files/manila_scheduler.json:
command: /usr/bin/manila-scheduler --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf command: /usr/bin/manila-scheduler --config-file /etc/manila/manila.conf
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -140,7 +140,7 @@ outputs:
config_image: {get_param: ContainerManilaConfigImage} config_image: {get_param: ContainerManilaConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/manila_share.json: /var/lib/kolla/config_files/manila_share.json:
command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf command: /usr/bin/manila-share --config-file /etc/manila/manila.conf
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -129,7 +129,7 @@ outputs:
config_image: {get_param: ContainerManilaConfigImage} config_image: {get_param: ContainerManilaConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/manila_share.json: /var/lib/kolla/config_files/manila_share.json:
command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf command: /usr/bin/manila-share --config-file /etc/manila/manila.conf
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -446,7 +446,7 @@ outputs:
command: command:
list_join: list_join:
- ' ' - ' '
- - /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-server - - /usr/bin/neutron-server --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-server
- get_attr: [NeutronLogging, cmd_extra_args] - get_attr: [NeutronLogging, cmd_extra_args]
config_files: &neutron_api_config_files config_files: &neutron_api_config_files
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"

View File

@ -257,7 +257,7 @@ outputs:
command: command:
list_join: list_join:
- ' ' - ' '
- - /usr/bin/neutron-dhcp-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent - - /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent
- get_attr: [NeutronLogging, cmd_extra_args] - get_attr: [NeutronLogging, cmd_extra_args]
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"

View File

@ -226,7 +226,7 @@ outputs:
command: command:
list_join: list_join:
- ' ' - ' '
- - /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent - - /usr/bin/neutron-l3-agent --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent
- get_attr: [NeutronLogging, cmd_extra_args] - get_attr: [NeutronLogging, cmd_extra_args]
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"

View File

@ -143,7 +143,7 @@ outputs:
command: command:
list_join: list_join:
- ' ' - ' '
- - /usr/bin/neutron-metadata-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metadata-agent - - /usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metadata-agent
- get_attr: [NeutronLogging, cmd_extra_args] - get_attr: [NeutronLogging, cmd_extra_args]
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"

View File

@ -282,7 +282,6 @@ outputs:
#!/bin/bash #!/bin/bash
set -xe set -xe
PYTHON -m neutron.cmd.destroy_patch_ports \ PYTHON -m neutron.cmd.destroy_patch_ports \
--config-file /usr/share/neutron/neutron-dist.conf \
--config-file /etc/neutron/neutron.conf \ --config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \ --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \
--config-dir /etc/neutron/conf.d/common \ --config-dir /etc/neutron/conf.d/common \
@ -290,7 +289,6 @@ outputs:
--log-file=/var/log/neutron/openvswitch-agent.log --log-file=/var/log/neutron/openvswitch-agent.log
/usr/bin/neutron-openvswitch-agent \ /usr/bin/neutron-openvswitch-agent \
--config-file /usr/share/neutron/neutron-dist.conf \
--config-file /etc/neutron/neutron.conf \ --config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \ --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \
--config-dir /etc/neutron/conf.d/common \ --config-dir /etc/neutron/conf.d/common \

View File

@ -152,7 +152,7 @@ outputs:
command: command:
list_join: list_join:
- ' ' - ' '
- - /usr/bin/neutron-sriov-nic-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common - - /usr/bin/neutron-sriov-nic-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common
- get_attr: [NeutronLogging, cmd_extra_args] - get_attr: [NeutronLogging, cmd_extra_args]
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"

View File

@ -262,7 +262,7 @@ outputs:
recurse: true recurse: true
- {get_attr: [OctaviaProviderConfig, role_data, kolla_permissions]} - {get_attr: [OctaviaProviderConfig, role_data, kolla_permissions]}
/var/lib/kolla/config_files/octavia_driver_agent.json: /var/lib/kolla/config_files/octavia_driver_agent.json:
command: /usr/bin/octavia-driver-agent --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/driver-agent.log --config-dir /etc/octavia/conf.d/common command: /usr/bin/octavia-driver-agent --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/driver-agent.log --config-dir /etc/octavia/conf.d/common
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -112,7 +112,7 @@ outputs:
config_image: {get_param: ContainerOctaviaConfigImage} config_image: {get_param: ContainerOctaviaConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/octavia_health_manager.json: /var/lib/kolla/config_files/octavia_health_manager.json:
command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/octavia-health-manager command: /usr/bin/octavia-health-manager --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/octavia-health-manager
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -97,7 +97,7 @@ outputs:
config_image: {get_param: ContainerOctaviaConfigImage} config_image: {get_param: ContainerOctaviaConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/octavia_housekeeping.json: /var/lib/kolla/config_files/octavia_housekeeping.json:
command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/octavia-housekeeping command: /usr/bin/octavia-housekeeping --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/octavia-housekeeping
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

View File

@ -86,7 +86,7 @@ outputs:
config_image: {get_param: ContainerOctaviaConfigImage} config_image: {get_param: ContainerOctaviaConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/octavia_worker.json: /var/lib/kolla/config_files/octavia_worker.json:
command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/octavia-worker command: /usr/bin/octavia-worker --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/octavia-worker
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"