From bee02d36a0d1dc5be8ff5e08865a7754a764cc12 Mon Sep 17 00:00:00 2001 From: MinSun Date: Wed, 30 May 2018 10:48:10 +0800 Subject: [PATCH] Mariadb bootstrap_cluster enhancement Using mariadb service defined in default when boot bootstrap_mariadb Not a bug here, just an enhancement. Change-Id: I1f8b51fb6177a8524483e600701924dbfc3403cb --- ansible/roles/mariadb/tasks/bootstrap_cluster.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ansible/roles/mariadb/tasks/bootstrap_cluster.yml b/ansible/roles/mariadb/tasks/bootstrap_cluster.yml index 56dabcc66b..8181593ecc 100644 --- a/ansible/roles/mariadb/tasks/bootstrap_cluster.yml +++ b/ansible/roles/mariadb/tasks/bootstrap_cluster.yml @@ -1,5 +1,8 @@ --- - name: Running MariaDB bootstrap container + vars: + service_name: "mariadb" + service: "{{ mariadb_services[service_name] }}" kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" @@ -9,16 +12,12 @@ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" DB_ROOT_PASSWORD: "{{ database_password }}" DB_MAX_TIMEOUT: "{{ database_max_timeout }}" - image: "{{ mariadb_image_full }}" + image: "{{ service.image }}" labels: BOOTSTRAP: name: "bootstrap_mariadb" restart_policy: "never" - volumes: - - "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" - - "mariadb:/var/lib/mysql" + volumes: "{{ service.volumes }}" notify: - Starting first MariaDB container