Merge "depends_on: add .service to avoid errors in logs"

2020-01-15 04:28:37 +00:00 · 2020-01-15 04:28:37 +00:00 · e69e3609af
parent 4bf586971b 5bfbcd32e0
commit e69e3609af
6 changed files with 6 additions and 6 deletions
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@ -353,7 +353,7 @@ outputs:
            restart: always
            security_opt: 'label=disable'
            depends_on:
-              - openvswitch
+              - openvswitch.service
            healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
            ulimit: {get_param: DockerNeutronDHCPAgentUlimit}
            volumes:
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@ -311,7 +311,7 @@ outputs:
            privileged: true
            restart: always
            depends_on:
-              - openvswitch
+              - openvswitch.service
            healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
            ulimit: {get_param: DockerNeutronL3AgentUlimit}
            volumes:
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@ -314,7 +314,7 @@ outputs:
            security_opt: 'label=disable'
            restart: always
            depends_on:
-              - openvswitch
+              - openvswitch.service
            healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
            ulimit: {get_param: DockerOpenvswitchUlimit}
            volumes:
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@ -775,7 +775,7 @@ outputs:
                user: nova
                restart: always
                depends_on:
-                  - tripleo_nova_libvirt
+                  - tripleo_nova_libvirt.service
                healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
                volumes:
                  list_concat:
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@ -680,7 +680,7 @@ outputs:
            restart: always
            cpuset_cpus: all
            depends_on:
-              - tripleo_nova_virtlogd
+              - tripleo_nova_virtlogd.service
            healthcheck:
              test: '/openstack/healthcheck libvirtd'
            volumes:
--- a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
+++ b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
@ -60,7 +60,7 @@ outputs:
            security_opt: 'label=disable'
            restart: always
            depends_on:
-              - openvswitch
+              - openvswitch.service
            ulimit: {get_param: DockerOpenvswitchUlimit}
            volumes:
              list_concat: