aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-03 16:09:38 +0000
committerGerrit Code Review <review@openstack.org>2016-01-03 16:09:38 +0000
commit479e7947c39cacc75c13a8d445e440d27d9e6eae (patch)
treeb54be53cabd11a357c8111a9b53699c3b74a8d63
parentf8f684df229c49e44c0612aee7352b7ec2e91e17 (diff)
parent0ddc6df9bca738751447e4be4b635c564d19e05c (diff)
downloadkolla-479e7947c39cacc75c13a8d445e440d27d9e6eae.tar.gz
kolla-479e7947c39cacc75c13a8d445e440d27d9e6eae.zip
Merge "Convert horizon to kolla_docker"
-rw-r--r--ansible/roles/horizon/tasks/start.yml18
1 files changed, 4 insertions, 14 deletions
diff --git a/ansible/roles/horizon/tasks/start.yml b/ansible/roles/horizon/tasks/start.yml
index 2d7617dfd..19d0f8759 100644
--- a/ansible/roles/horizon/tasks/start.yml
+++ b/ansible/roles/horizon/tasks/start.yml
@@ -1,19 +1,9 @@
---
- name: Starting horizon container
- docker:
- tty: True
- net: host
- pull: "{{ docker_pull_policy }}"
- restart_policy: "{{ docker_restart_policy }}"
- restart_policy_retry: "{{ docker_restart_policy_retry }}"
- state: reloaded
- registry: "{{ docker_registry }}"
- username: "{{ docker_registry_username }}"
- password: "{{ docker_registry_password }}"
- insecure_registry: "{{ docker_insecure_registry }}"
- name: horizon
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
image: "{{ horizon_image_full }}"
+ name: "horizon"
volumes: "{{ node_config_directory }}/horizon/:{{ container_config_directory }}/:ro"
- env:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['horizon']