Fixes undercloud install failure with setting hostname

[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 79629c2..ebf081d 100644 (file)
--- a/lib/ansible/playbooks/prepare_overcloud_containers.yml
+++ b/lib/ansible/playbooks/prepare_overcloud_containers.yml
@@ -20,86 +20,31 @@
       when: patched_docker_services|length > 0
     - name: Prepare generic docker registry image file
       shell: >
-        {{ stackrc }} && openstack overcloud container image prepare
-        --namespace docker.io/tripleo{{ os_version }}
-        --tag {{ container_tag }}
-        --push-destination {{ undercloud_ip }}:8787
-        -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml
-        --output-images-file overcloud_containers.yml
-      become: yes
-      become_user: stack
-    - name: Prepare SDN docker registry image file
-      shell: >
-        {{ stackrc }} && openstack overcloud container image prepare
-        --namespace docker.io/tripleo{{ os_version }}
-        --tag {{ container_tag }}
-        --push-destination {{ undercloud_ip }}:8787
-        -e {{ sdn_env_file }}
-        --output-images-file sdn_containers.yml
-      become: yes
-      become_user: stack
-      when: sdn != false
-    - name: Upload docker images to local registry
-      shell: >
-        {{ stackrc }} && openstack overcloud container image upload
-        --config-file /home/stack/overcloud_containers.yml
-    - name: Upload SDN docker images to local registry
-      shell: >
-        {{ stackrc }} && openstack overcloud container image upload
-        --config-file /home/stack/sdn_containers.yml
-      when: sdn != false
+        sudo openstack tripleo container image prepare
+        -e /home/stack/containers-prepare-parameter.yaml
+        --output-env-file docker-images.yaml
     - name: Collect docker images in registry
       uri:
         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(" ")
-      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
+      shell: "{{ container_client }} push {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex"
       when:
         - patched_docker_services|length > 0
         - item in (response.json)['repositories']|join(" ")
       with_items: "{{ patched_docker_services }}"
-    - name: Prepare deployment generic docker image file
-      shell: >
-        {{ stackrc }} && openstack overcloud container image prepare
-        --namespace {{ undercloud_ip }}:8787/tripleo{{ os_version }}
-        --tag {{ container_tag }}
-        -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml
-        --output-env-file docker-images.yaml
-      become: yes
-      become_user: stack
-    - name: Prepare deployment SDN docker image file
-      shell: >
-        {{ stackrc }} && openstack overcloud container image prepare
-        --namespace {{ undercloud_ip }}:8787/tripleo{{ os_version }}
-        --tag {{ container_tag }}
-        -e {{ sdn_env_file }}
-        --output-env-file sdn-images.yaml
-      when: sdn != false
-      become: yes
-      become_user: stack
     - name: Modify Images with Apex tag
       replace:
-        path: "{{ item[0] }}"
-        regexp: "(\\s*Docker.*?:.*?centos-binary-{{ item[1] }}):.*"
+        path: "/home/stack/docker-images.yaml"
+        regexp: "(\\s*Docker.*?:.*?centos-binary-{{ item }}):.*"
         replace: '\1:apex'
-      with_nested:
-        - [ '/home/stack/sdn-images.yaml', '/home/stack/docker-images.yaml']
-        - "{{ patched_docker_services }}"
-    - name: Pull Ceph docker image
-      shell: docker pull {{ ceph_docker_image }}
-      become: yes
-    - name: Tag Ceph image for local registry
-      shell: docker tag {{ ceph_docker_image }} {{ undercloud_ip }}:8787/{{ ceph_docker_image }}
-      become: yes
-    - name: Push Ceph docker image to local registry
-      shell: docker push {{ undercloud_ip }}:8787/{{ ceph_docker_image }}
+      with_items: "{{ patched_docker_services }}"
       become: yes