Move database creation into role

There is no record for why we implement the database creation outside
of the role in the playbook, when we could do it inside the role.

Implementing it inside the role allows us to reduce the quantity of
group_vars duplicated from the role, and allows us to better document
the required variables in the role. The delegation can still be done
as it is done in the playbook too.

In this patch we implement a new variable called 'masakari_db_setup_host'
which is used in the role to allow delegation of the database setup
task to any host, but defaults to the first member of the galera_all
host group. We also document the variable 'masakari_galera_address' which
has been used for a long time, but never documented. A bunch of unused
variables have also been removed.

Change-Id: I6c1e4e32681cbb592f6daa805501031bb84e6e0c
This commit is contained in:
Jesse Pretorius
2018-06-28 15:10:47 +01:00
parent 183af3af95
commit 056208c580
3 changed files with 34 additions and 3 deletions
+8
View File
@@ -36,6 +36,14 @@ masakari_system_shell: /bin/false
masakari_system_comment: masakari system user
masakari_system_user_home: "/var/lib/{{ masakari_system_user_name }}"
## Database credentials
masakari_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
masakari_galera_address: "{{ galera_address | default('127.0.0.1') }}"
masakari_galera_database: masakari
masakari_galera_user: masakari
masakari_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
masakari_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
# masakari packages that must be installed before anything else
masakari_requires_pip_packages:
- virtualenv
+26
View File
@@ -13,6 +13,32 @@
# See the License for the specific language governing permissions and
# limitations under the License
- name: Create DB for service
mysql_db:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ masakari_galera_address }}"
name: "{{ masakari_galera_database }}"
state: "present"
delegate_to: "{{ masakari_db_setup_host }}"
no_log: True
- name: Grant access to the DB for the service
mysql_user:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ masakari_galera_address }}"
name: "{{ masakari_galera_user }}"
password: "{{ masakari_container_mysql_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ masakari_galera_database }}.*:ALL"
delegate_to: "{{ masakari_db_setup_host }}"
with_items:
- "localhost"
- "%"
no_log: True
- name: Perform a synchronization of the Masakari database
command: "{{ masakari_bin }}/masakari-manage db sync"
become: yes
-3
View File
@@ -25,9 +25,6 @@
user_name: "{{ masakari_rabbitmq_userid }}"
user_password: "{{ masakari_rabbitmq_password }}"
when: groups['rabbitmq_all'] is defined
- include: common/create-grant-db.yml
db_name: "{{ masakari_galera_database }}"
db_password: "{{ masakari_container_mysql_password }}"
roles:
- role: os_masakari
vars_files: