Remove the database creation & messaging tasks from the role

This change removes the database creation and messaging tasks
from this role as the role should expect to be given a database
and message queue.

These tasks will be added in a subsequent patch which implements
a set of testing playbooks.

Change-Id: I2a26b2178b0245c5f72dbec201e2191fe4e6543e
This commit is contained in:
Jesse Pretorius 2016-03-22 21:25:16 +00:00
parent 1ce6e3d691
commit c536ed54bb
3 changed files with 1 additions and 70 deletions

View File

@ -13,36 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Create database for ironic
mysql_db:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ ironic_galera_address }}"
name: "{{ ironic_galera_database }}"
state: "present"
register: ironic_db
tags:
- ironic-db-setup
- name: Grant access to the DB
mysql_user:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ ironic_galera_address }}"
name: "{{ ironic_galera_user }}"
password: "{{ ironic_galera_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ ironic_galera_database }}.*:ALL"
with_items:
- "localhost"
- "{{ ironic_galera_address }}"
- "%"
tags:
- ironic-db-setup
- name: Update database schema
command: "{{ ironic_bin }}/ironic-dbsync --config-file /etc/ironic/ironic.conf upgrade"
command: "{{ ironic_bin }}/ironic-dbsync upgrade"
become: yes
become_user: "{{ ironic_system_user_name }}"
notify:

View File

@ -1,37 +0,0 @@
---
# Copyright 2014, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Ensure Rabbitmq vhost
rabbitmq_vhost:
name: "{{ ironic_rabbitmq_vhost }}"
state: "present"
delegate_to: "{{ groups['rabbitmq_all'][0] }}"
tags:
- ironic-rabbitmq
- ironic-rabbitmq-vhost
- name: Ensure rabbitmq user
rabbitmq_user:
user: "{{ ironic_rabbitmq_userid }}"
password: "{{ ironic_rabbitmq_password }}"
vhost: "{{ ironic_rabbitmq_vhost }}"
configure_priv: ".*"
read_priv: ".*"
write_priv: ".*"
state: "present"
delegate_to: "{{ groups['rabbitmq_all'][0] }}"
tags:
- ironic-rabbitmq
- ironic-rabbitmq-user

View File

@ -139,7 +139,3 @@
- ironic-install
- ironic-apt-packages
- include: ironic_messaging_setup.yml
when: >
inventory_hostname == groups['ironic_all'][0]