diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:18:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:18:38 +0000 |
| commit | 9dc5c30b396d8e684a8db9596e1df68853daaeb6 (patch) | |
| tree | 4af2847601dc1241d691d023b8baf4778ab9acc2 | |
| parent | 8c54c82b7dac4dd1cf2e952c62ad8d89920ba7d1 (diff) | |
| parent | 715942ce305b659ae019782aa412fee52d4df3e0 (diff) | |
| download | kolla-9dc5c30b396d8e684a8db9596e1df68853daaeb6.tar.gz kolla-9dc5c30b396d8e684a8db9596e1df68853daaeb6.zip | |
Merge "Allow horizon role to pull images"
| -rw-r--r-- | ansible/roles/horizon/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/horizon/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/horizon/tasks/pull.yml | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ansible/roles/horizon/tasks/deploy.yml b/ansible/roles/horizon/tasks/deploy.yml new file mode 100644 index 000000000..1f16915ad --- /dev/null +++ b/ansible/roles/horizon/tasks/deploy.yml @@ -0,0 +1,4 @@ +--- +- include: config.yml + +- include: start.yml diff --git a/ansible/roles/horizon/tasks/main.yml b/ansible/roles/horizon/tasks/main.yml index 1f16915ad..b017e8b4a 100644 --- a/ansible/roles/horizon/tasks/main.yml +++ b/ansible/roles/horizon/tasks/main.yml @@ -1,4 +1,2 @@ --- -- include: config.yml - -- include: start.yml +- include: "{{ action }}.yml" diff --git a/ansible/roles/horizon/tasks/pull.yml b/ansible/roles/horizon/tasks/pull.yml new file mode 100644 index 000000000..99eab899d --- /dev/null +++ b/ansible/roles/horizon/tasks/pull.yml @@ -0,0 +1,7 @@ +--- +- name: Pulling horizon image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ horizon_image_full }}" + when: inventory_hostname in groups['horizon'] |