diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-26 14:28:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-26 14:29:00 +0000 |
| commit | c91e701b0a9f1d2f9edb53dae6209605c253872a (patch) | |
| tree | 1f8ef47ea60f71f6ce0c029c2d9d4ec35b9fc7c2 | |
| parent | 87355c231a3bdf17fc1e9b1412f44f85dd549632 (diff) | |
| parent | 1f430a4935b2745afd6f8311ca64718813a15b11 (diff) | |
| download | kolla-c91e701b0a9f1d2f9edb53dae6209605c253872a.tar.gz kolla-c91e701b0a9f1d2f9edb53dae6209605c253872a.zip | |
Merge "Fix swift regression caused by swift shared image change"
| -rw-r--r-- | ansible/roles/swift/defaults/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/swift/defaults/main.yml b/ansible/roles/swift/defaults/main.yml index 1dda7c091..b969843cb 100644 --- a/ansible/roles/swift/defaults/main.yml +++ b/ansible/roles/swift/defaults/main.yml @@ -14,7 +14,7 @@ swift_account_image_full: "{{ swift_account_image }}:{{ swift_account_tag }}" swift_container_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-swift-container" swift_container_tag: "{{ openstack_release }}" -swift_container_image_full: "{{ swift_container_server_image }}:{{ swift_container_tag }}" +swift_container_image_full: "{{ swift_container_image }}:{{ swift_container_tag }}" swift_object_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-swift-object" swift_object_tag: "{{ openstack_release }}" |
