diff options
| author | SamYaple <sam@yaple.net> | 2016-01-01 04:14:53 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-01-04 19:49:26 +0000 |
| commit | 462e8a3b6e5c0dd8d01dec29170b1aa7ff055554 (patch) | |
| tree | f5679da9792e99c989579f7e84127ead6737c1dc | |
| parent | 58daa10ae30cc750e5f8f3f5e512f444d12aa5f7 (diff) | |
| download | kolla-462e8a3b6e5c0dd8d01dec29170b1aa7ff055554.tar.gz kolla-462e8a3b6e5c0dd8d01dec29170b1aa7ff055554.zip | |
Allow common role to pull images
Change-Id: I3de01770eca6b7e681b7964a6d6e15564065aaea
Partially-Implements: blueprint pre-pull-images
| -rw-r--r-- | ansible/roles/common/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/pull.yml | 12 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 9 |
4 files changed, 24 insertions, 5 deletions
diff --git a/ansible/roles/common/tasks/deploy.yml b/ansible/roles/common/tasks/deploy.yml new file mode 100644 index 000000000..1f16915ad --- /dev/null +++ b/ansible/roles/common/tasks/deploy.yml @@ -0,0 +1,4 @@ +--- +- include: config.yml + +- include: start.yml diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 1f16915ad..b017e8b4a 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,4 +1,2 @@ --- -- include: config.yml - -- include: start.yml +- include: "{{ action }}.yml" diff --git a/ansible/roles/common/tasks/pull.yml b/ansible/roles/common/tasks/pull.yml new file mode 100644 index 000000000..1bd963bb8 --- /dev/null +++ b/ansible/roles/common/tasks/pull.yml @@ -0,0 +1,12 @@ +--- +- name: Pulling rsyslog image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ rsyslog_image_full }}" + +- name: Pulling kolla-ansible image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ ansible_image_full }}" diff --git a/tools/kolla-ansible b/tools/kolla-ansible index d24941193..7543b8544 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -34,6 +34,7 @@ Options: Commands: deploy Deploy and start all kolla containers + pull Pull all images for containers (only pulls, no runnnig container changes) EOF } @@ -79,8 +80,12 @@ done case "$1" in (deploy) - ACTION="Deploying Playbook" - CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK" + ACTION="Deploying Playbooks" + CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK -e action=deploy" + ;; +(pull) + ACTION="Pulling Docker images" + CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK -e action=pull" ;; (*) usage |