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 'congress_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 'congress_galera_address' which has been used for a long time, but never documented. A bunch of unused variables have also been removed. Change-Id: Id22bb9c3c3146aee6ccd7462c4a52b0be718ad55
This commit is contained in:
parent
3e567746ee
commit
2b4f3a4f0c
|
@ -87,6 +87,8 @@ congress_keystone_auth_plugin: password
|
|||
congress_service_in_ldap: false
|
||||
|
||||
## DB info
|
||||
congress_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
|
||||
congress_galera_address: "{{ galera_address | default('127.0.0.1') }}"
|
||||
congress_galera_database: congress
|
||||
congress_galera_user: congress
|
||||
congress_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
|
||||
|
|
|
@ -14,7 +14,33 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: create congress database schema
|
||||
- name: Create DB for service
|
||||
mysql_db:
|
||||
login_user: "{{ galera_root_user }}"
|
||||
login_password: "{{ galera_root_password }}"
|
||||
login_host: "{{ congress_galera_address }}"
|
||||
name: "{{ congress_galera_database }}"
|
||||
state: "present"
|
||||
delegate_to: "{{ congress_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: "{{ congress_galera_address }}"
|
||||
name: "{{ congress_galera_user }}"
|
||||
password: "{{ congress_container_mysql_password }}"
|
||||
host: "{{ item }}"
|
||||
state: "present"
|
||||
priv: "{{ congress_galera_database }}.*:ALL"
|
||||
delegate_to: "{{ congress_db_setup_host }}"
|
||||
with_items:
|
||||
- "localhost"
|
||||
- "%"
|
||||
no_log: True
|
||||
|
||||
- name: Create congress database schema
|
||||
command: >
|
||||
{{ congress_bin }}/congress-db-manage
|
||||
--config-file {{ congress_etc_dir }}/congress.conf upgrade head
|
||||
|
|
|
@ -26,11 +26,6 @@
|
|||
user_password: "{{ congress_rabbitmq_password }}"
|
||||
when:
|
||||
- "groups['rabbitmq_all'] is defined"
|
||||
|
||||
- include: common/create-grant-db.yml
|
||||
db_name: "{{ congress_galera_database }}"
|
||||
db_password: "{{ congress_container_mysql_password }}"
|
||||
|
||||
roles:
|
||||
- role: "os_congress"
|
||||
vars_files:
|
||||
|
|
Loading…
Reference in New Issue