Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Attempting to fix NFS issues
[apex.git]
/
lib
/
ansible
/
playbooks
/
prepare_overcloud_containers.yml
diff --git
a/lib/ansible/playbooks/prepare_overcloud_containers.yml
b/lib/ansible/playbooks/prepare_overcloud_containers.yml
index
e2a4e13
..
db1bff8
100644
(file)
--- a/
lib/ansible/playbooks/prepare_overcloud_containers.yml
+++ b/
lib/ansible/playbooks/prepare_overcloud_containers.yml
@@
-28,14
+28,13
@@
url: http://{{ undercloud_ip }}:8787/v2/_catalog
body_format: json
register: response
url: http://{{ undercloud_ip }}:8787/v2/_catalog
body_format: json
register: response
- -
name: Patch Docker images
- shell: >
- cd /home/stack/containers/{{ item }} && docker build
- -t {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex .
+ -
include_tasks: patch_containers.yml
+ with_items: "{{ patched_docker_services }}"
+ loop_control:
+ loop_var: item
when:
- patched_docker_services|length > 0
- item in (response.json)['repositories']|join(" ")
when:
- patched_docker_services|length > 0
- item in (response.json)['repositories']|join(" ")
- with_items: "{{ patched_docker_services }}"
- name: Push patched docker images to local registry
shell: docker push {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex
when:
- name: Push patched docker images to local registry
shell: docker push {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex
when:
@@
-45,7
+44,7
@@
- name: Modify Images with Apex tag
replace:
path: "/home/stack/docker-images.yaml"
- name: Modify Images with Apex tag
replace:
path: "/home/stack/docker-images.yaml"
- regexp: "(\\s*Docker.*?:.*?centos-binary-{{ item
[1]
}}):.*"
+ regexp: "(\\s*Docker.*?:.*?centos-binary-{{ item }}):.*"
replace: '\1:apex'
with_items: "{{ patched_docker_services }}"
become: yes
replace: '\1:apex'
with_items: "{{ patched_docker_services }}"
become: yes