aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/mariadb/tasks/deploy.yml20
-rw-r--r--ansible/roles/mariadb/tasks/main.yml20
-rw-r--r--ansible/roles/mariadb/tasks/pull.yml7
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']