diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:20:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:20:03 +0000 |
| commit | 2c7ae58dfb602c766ca5d014cb49211ed6a5211f (patch) | |
| tree | 01dafa66adc3c195d2a0d76b8cabd48421361fa4 | |
| parent | 5b7e37d199dc5d865cb33efa81e12a7fc7d3b689 (diff) | |
| parent | 9efc593c8f7124589a5e562139075447a4c84f24 (diff) | |
| download | kolla-2c7ae58dfb602c766ca5d014cb49211ed6a5211f.tar.gz kolla-2c7ae58dfb602c766ca5d014cb49211ed6a5211f.zip | |
Merge "Allow keystone role to pull images"
| -rw-r--r-- | ansible/roles/keystone/tasks/deploy.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/main.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/pull.yml | 7 |
3 files changed, 22 insertions, 13 deletions
diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml new file mode 100644 index 000000000..10a7a1bf5 --- /dev/null +++ b/ansible/roles/keystone/tasks/deploy.yml @@ -0,0 +1,14 @@ +--- +- include: config.yml + when: inventory_hostname in groups['keystone'] + +- include: bootstrap.yml + when: inventory_hostname in groups['keystone'] + +- include: start.yml + when: inventory_hostname in groups['keystone'] + +- include: register.yml + when: inventory_hostname in groups['keystone'] + +- include: check.yml diff --git a/ansible/roles/keystone/tasks/main.yml b/ansible/roles/keystone/tasks/main.yml index 10a7a1bf5..b017e8b4a 100644 --- a/ansible/roles/keystone/tasks/main.yml +++ b/ansible/roles/keystone/tasks/main.yml @@ -1,14 +1,2 @@ --- -- include: config.yml - when: inventory_hostname in groups['keystone'] - -- include: bootstrap.yml - when: inventory_hostname in groups['keystone'] - -- include: start.yml - when: inventory_hostname in groups['keystone'] - -- include: register.yml - when: inventory_hostname in groups['keystone'] - -- include: check.yml +- include: "{{ action }}.yml" diff --git a/ansible/roles/keystone/tasks/pull.yml b/ansible/roles/keystone/tasks/pull.yml new file mode 100644 index 000000000..b8c067236 --- /dev/null +++ b/ansible/roles/keystone/tasks/pull.yml @@ -0,0 +1,7 @@ +--- +- name: Pulling keystone image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ keystone_image_full }}" + when: inventory_hostname in groups['keystone'] |