From 604e8217a9c875889377ea03d1fae154d5f5aa5c Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 7 Feb 2018 11:57:48 +0000 Subject: [PATCH] Remove placement_database related options/code The placement_database config options were added in Newton but the actual code to use the options was reverted and is not used. Change-Id: I97f44c0b52af6c356433cf2c1021e9c175a8710d Depends-On: https://review.openstack.org/541685 Related-Reviews: I31293ac4689630e4113588ab2c6373cf572b8f38 Closes-Bug: #1670419 --- etc/openstack_deploy/user_secrets.yml | 1 - inventory/group_vars/nova_all.yml | 3 --- playbooks/os-nova-install.yml | 9 --------- 3 files changed, 13 deletions(-) diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml index 50c7c0e8c2..b6af625cb9 100644 --- a/etc/openstack_deploy/user_secrets.yml +++ b/etc/openstack_deploy/user_secrets.yml @@ -98,7 +98,6 @@ nova_metadata_proxy_secret: nova_service_password: nova_rabbitmq_password: nova_placement_service_password: -nova_placement_container_mysql_password: # LXD Options for nova compute lxd_trust_password: diff --git a/inventory/group_vars/nova_all.yml b/inventory/group_vars/nova_all.yml index 37fc0a2127..4e0dabd1da 100644 --- a/inventory/group_vars/nova_all.yml +++ b/inventory/group_vars/nova_all.yml @@ -60,9 +60,6 @@ nova_galera_address: "{{ galera_address }}" nova_api_galera_user: nova_api nova_api_galera_database: nova_api nova_api_galera_address: "{{ galera_address }}" -nova_placement_galera_user: nova_placement -nova_placement_galera_database: nova_placement -nova_placement_galera_address: "{{ galera_address }}" nova_cell0_database: nova_cell0 nova_external_ssl: "{{ openstack_external_ssl }}" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index 41ef6fc84e..c2e674cf38 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -66,15 +66,6 @@ db_append_privs: "yes" run_once: yes - - name: Configure MySQL user (nova-placement) - include: common-tasks/mysql-db-user.yml - vars: - user_name: "{{ nova_placement_galera_user }}" - password: "{{ nova_placement_container_mysql_password }}" - login_host: "{{ nova_placement_galera_address }}" - db_name: "{{ nova_placement_galera_database }}" - run_once: yes - - name: Configure MySQL user (nova-api cell0) include: common-tasks/mysql-db-user.yml vars: