diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 08:21:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 08:21:58 +0000 |
| commit | 5127c935c405ea708e523dde542ae69ac676eac6 (patch) | |
| tree | f5416e9189c8b3a3247a22805c424b64acc4f53b | |
| parent | 38188c6b530fabcf0d718c5746fa47f21c2502be (diff) | |
| parent | bdc0f531e71e271fb0ef4bac1bbc1763ba6cf46e (diff) | |
| download | kolla-5127c935c405ea708e523dde542ae69ac676eac6.tar.gz kolla-5127c935c405ea708e523dde542ae69ac676eac6.zip | |
Merge "Allow mariadb role to pull images"
| -rw-r--r-- | ansible/roles/mariadb/tasks/deploy.yml | 20 | ||||
| -rw-r--r-- | ansible/roles/mariadb/tasks/main.yml | 20 | ||||
| -rw-r--r-- | ansible/roles/mariadb/tasks/pull.yml | 7 |
3 files changed, 28 insertions, 19 deletions
diff --git a/ansible/roles/mariadb/tasks/deploy.yml b/ansible/roles/mariadb/tasks/deploy.yml new file mode 100644 index 000000000..c13e4eb0a --- /dev/null +++ b/ansible/roles/mariadb/tasks/deploy.yml @@ -0,0 +1,20 @@ +--- +- include: config.yml + +- include: bootstrap.yml + +- include: start.yml + +# We use register as a test to see whether the database is active and ready to +# communicate. This run on all hosts that have a database and attempts to talk +# to the local database rather than the vip, +- include: register.yml + +# This will restart the container we initially used to bootstrap the cluster to +# make it match the other containers environment-wise. This also prevents a +# change from showing up when rerunning the playbooks +- include: start.yml + +# Since the last start.yml may have recreated some containers we must wait and +# check the health again to ensure the hosts are active. +- include: register.yml diff --git a/ansible/roles/mariadb/tasks/main.yml b/ansible/roles/mariadb/tasks/main.yml index c13e4eb0a..b017e8b4a 100644 --- a/ansible/roles/mariadb/tasks/main.yml +++ b/ansible/roles/mariadb/tasks/main.yml @@ -1,20 +1,2 @@ --- -- include: config.yml - -- include: bootstrap.yml - -- include: start.yml - -# We use register as a test to see whether the database is active and ready to -# communicate. This run on all hosts that have a database and attempts to talk -# to the local database rather than the vip, -- include: register.yml - -# This will restart the container we initially used to bootstrap the cluster to -# make it match the other containers environment-wise. This also prevents a -# change from showing up when rerunning the playbooks -- include: start.yml - -# Since the last start.yml may have recreated some containers we must wait and -# check the health again to ensure the hosts are active. -- include: register.yml +- include: "{{ action }}.yml" diff --git a/ansible/roles/mariadb/tasks/pull.yml b/ansible/roles/mariadb/tasks/pull.yml new file mode 100644 index 000000000..13d27693b --- /dev/null +++ b/ansible/roles/mariadb/tasks/pull.yml @@ -0,0 +1,7 @@ +--- +- name: Pulling mariadb image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ mariadb_image_full }}" + when: inventory_hostname in groups['mariadb'] |