diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:15:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:15:05 +0000 |
| commit | ab09cc02157bb5d0266b389b7820705cb86dee55 (patch) | |
| tree | 85d0eb261cfff6f8ae850a5786ed5de3c005e715 | |
| parent | 8123dbdc62dba94c595aedab03901be273da009e (diff) | |
| parent | 912bce7b3eefad9c918256ba77c325a4cc4931ea (diff) | |
| download | kolla-ab09cc02157bb5d0266b389b7820705cb86dee55.tar.gz kolla-ab09cc02157bb5d0266b389b7820705cb86dee55.zip | |
Merge "Allow cinder role to pull images"
| -rw-r--r-- | ansible/roles/cinder/tasks/deploy.yml | 27 | ||||
| -rw-r--r-- | ansible/roles/cinder/tasks/main.yml | 27 | ||||
| -rw-r--r-- | ansible/roles/cinder/tasks/pull.yml | 28 |
3 files changed, 56 insertions, 26 deletions
diff --git a/ansible/roles/cinder/tasks/deploy.yml b/ansible/roles/cinder/tasks/deploy.yml new file mode 100644 index 000000000..06909bd22 --- /dev/null +++ b/ansible/roles/cinder/tasks/deploy.yml @@ -0,0 +1,27 @@ +--- +- include: ceph.yml + when: + - enable_ceph | bool + - inventory_hostname in groups['ceph-mon'] or + inventory_hostname in groups['cinder-api'] or + inventory_hostname in groups['cinder-volume'] or + inventory_hostname in groups['cinder-scheduler'] or + inventory_hostname in groups['cinder-backup'] + +- include: register.yml + when: inventory_hostname in groups['cinder-api'] + +- include: config.yml + when: inventory_hostname in groups['cinder-api'] or + inventory_hostname in groups['cinder-volume'] or + inventory_hostname in groups['cinder-scheduler'] or + inventory_hostname in groups['cinder-backup'] + +- include: bootstrap.yml + when: inventory_hostname in groups['cinder-api'] + +- include: start.yml + when: inventory_hostname in groups['cinder-api'] or + inventory_hostname in groups['cinder-volume'] or + inventory_hostname in groups['cinder-scheduler'] or + inventory_hostname in groups['cinder-backup'] diff --git a/ansible/roles/cinder/tasks/main.yml b/ansible/roles/cinder/tasks/main.yml index 06909bd22..b017e8b4a 100644 --- a/ansible/roles/cinder/tasks/main.yml +++ b/ansible/roles/cinder/tasks/main.yml @@ -1,27 +1,2 @@ --- -- include: ceph.yml - when: - - enable_ceph | bool - - inventory_hostname in groups['ceph-mon'] or - inventory_hostname in groups['cinder-api'] or - inventory_hostname in groups['cinder-volume'] or - inventory_hostname in groups['cinder-scheduler'] or - inventory_hostname in groups['cinder-backup'] - -- include: register.yml - when: inventory_hostname in groups['cinder-api'] - -- include: config.yml - when: inventory_hostname in groups['cinder-api'] or - inventory_hostname in groups['cinder-volume'] or - inventory_hostname in groups['cinder-scheduler'] or - inventory_hostname in groups['cinder-backup'] - -- include: bootstrap.yml - when: inventory_hostname in groups['cinder-api'] - -- include: start.yml - when: inventory_hostname in groups['cinder-api'] or - inventory_hostname in groups['cinder-volume'] or - inventory_hostname in groups['cinder-scheduler'] or - inventory_hostname in groups['cinder-backup'] +- include: "{{ action }}.yml" diff --git a/ansible/roles/cinder/tasks/pull.yml b/ansible/roles/cinder/tasks/pull.yml new file mode 100644 index 000000000..6e2249f2d --- /dev/null +++ b/ansible/roles/cinder/tasks/pull.yml @@ -0,0 +1,28 @@ +--- +- name: Pulling cinder-api image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ cinder_api_image_full }}" + when: inventory_hostname in groups['cinder-api'] + +- name: Pulling cinder-backup image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ cinder_backup_image_full }}" + when: inventory_hostname in groups['cinder-backup'] + +- name: Pulling cinder-scheduler image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ cinder_scheduler_image_full }}" + when: inventory_hostname in groups['cinder-scheduler'] + +- name: Pulling cinder-volume image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ cinder_volume_image_full }}" + when: inventory_hostname in groups['cinder-volume'] |