From 0995a40100c6cb2892aca78794414055ab4ec713 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Thu, 7 Jan 2016 16:00:43 +0000 Subject: [PATCH] Allow mistral role to pull images Change-Id: Id5e56f62dff4fc7bc52641a56abab3ee88a25740 Partially-Implements: blueprint pre-pull-images --- ansible/roles/mistral/tasks/deploy.yml | 16 ++++++++++++++++ ansible/roles/mistral/tasks/main.yml | 20 ++++++-------------- ansible/roles/mistral/tasks/pull.yml | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 ansible/roles/mistral/tasks/deploy.yml create mode 100644 ansible/roles/mistral/tasks/pull.yml diff --git a/ansible/roles/mistral/tasks/deploy.yml b/ansible/roles/mistral/tasks/deploy.yml new file mode 100644 index 0000000000..5f062e5c51 --- /dev/null +++ b/ansible/roles/mistral/tasks/deploy.yml @@ -0,0 +1,16 @@ +--- +- include: register.yml + when: inventory_hostname in groups['mistral-api'] + +- include: config.yml + when: inventory_hostname in groups['mistral-api'] or + inventory_hostname in groups['mistral-engine'] or + inventory_hostname in groups['mistral-executor'] + +- include: bootstrap.yml + when: inventory_hostname in groups['mistral-api'] + +- include: start.yml + when: inventory_hostname in groups['mistral-api'] or + inventory_hostname in groups['mistral-engine'] or + inventory_hostname in groups['mistral-executor'] diff --git a/ansible/roles/mistral/tasks/main.yml b/ansible/roles/mistral/tasks/main.yml index 5f062e5c51..e261f83ee5 100644 --- a/ansible/roles/mistral/tasks/main.yml +++ b/ansible/roles/mistral/tasks/main.yml @@ -1,16 +1,8 @@ --- -- include: register.yml - when: inventory_hostname in groups['mistral-api'] +- include: "{{ action }}.yml" + when: not common_run -- include: config.yml - when: inventory_hostname in groups['mistral-api'] or - inventory_hostname in groups['mistral-engine'] or - inventory_hostname in groups['mistral-executor'] - -- include: bootstrap.yml - when: inventory_hostname in groups['mistral-api'] - -- include: start.yml - when: inventory_hostname in groups['mistral-api'] or - inventory_hostname in groups['mistral-engine'] or - inventory_hostname in groups['mistral-executor'] +- name: Registering common role has run + set_fact: + common_run: True + when: not common_run diff --git a/ansible/roles/mistral/tasks/pull.yml b/ansible/roles/mistral/tasks/pull.yml new file mode 100644 index 0000000000..f8782d9f09 --- /dev/null +++ b/ansible/roles/mistral/tasks/pull.yml @@ -0,0 +1,21 @@ +--- +- name: Pulling mistral-api image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ mistral_api_image_full }}" + when: inventory_hostname in groups['mistral-api'] + +- name: Pulling mistral-engine image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ mistral_engine_image_full }}" + when: inventory_hostname in groups['mistral-engine'] + +- name: Pulling mistral-executor image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ mistral_executorngine_image_full }}" + when: inventory_hostname in groups['mistral-executor']