Merge "Use dedicated container tag per skydive service"

This commit is contained in:
Zuul 2019-03-05 19:54:59 +00:00 committed by Gerrit Code Review
commit 34c6173b07

View File

@ -94,9 +94,10 @@ outputs:
dest: "{{playbook_dir}}/skydive/global_defaults.yml"
content: |
skydive_docker_registry: {{skydive_analyzer_docker_image | regex_replace("([^/]*).*", "\1")}}
skydive_docker_image_tag: {{skydive_analyzer_docker_image | regex_replace(".*:")}}
skydive_analyzer_docker_image_tag: {{skydive_analyzer_docker_image | regex_replace(".*:")}}
skydive_analyzer_docker_image: {{skydive_analyzer_docker_image | regex_replace("[^/]*/([^:]*).*", "\1")}}
skydive_analyzer_docker_command: "/usr/bin/skydive analyzer --conf /etc/skydive.yml"
skydive_agent_docker_image_tag: {{skydive_agent_docker_image | regex_replace(".*:")}}
skydive_agent_docker_image: {{skydive_agent_docker_image | regex_replace("[^/]*/([^:]*).*", "\1")}}
skydive_agent_docker_command: "/usr/bin/skydive agent --conf /etc/skydive.yml"
os_auth_url: {{overcloud_keystone_url}}/v3