From f24f266208b8c479a0c389d66a43a83d9b749591 Mon Sep 17 00:00:00 2001 From: Michael Davies Date: Mon, 19 Sep 2016 19:20:33 +0930 Subject: [PATCH] os_ironic mysql password variable not updated Ironic in OSA is currently broken as the ironic database user isn't created, and consequently the ironic services can't connect to the database. It broke back in patch 91deb13. This patch corrects the os_ironic side of the problem. Another patch will fix the openstack-ansible side. Change-Id: I30b04756258a3241bb2444fd98f3a6624c0d2309 Partial-Bug: #1625081 Signed-off-by: Michael Davies --- defaults/main.yml | 4 ++-- tests/test-install-ironic.yml | 2 +- tests/test-vars.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index cdec602c..3b128270 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -108,7 +108,7 @@ ironic_openstack_auth_strategy: keystone ironic_openstack_api_url: '' # Not required when we have keystone ironic_openstack_dhcp_provider: neutron ironic_openstack_sync_power_state_interval: 60 -ironic_openstack_db_connection_string: "mysql+pymysql://{{ ironic_galera_user }}:{{ ironic_galera_password }}@{{ ironic_galera_address }}/ironic" +ironic_openstack_db_connection_string: "mysql+pymysql://{{ ironic_galera_user }}:{{ ironic_container_mysql_password }}@{{ ironic_galera_address }}/ironic" # Standalone Ironic configuration ironic_standalone_driver_list: agent_ipmitool @@ -116,7 +116,7 @@ ironic_standalone_auth_strategy: noauth ironic_standalone_api_url: "api_url={{ ironic_service_internaluri }}/" ironic_standalone_dhcp_provider: none ironic_standalone_sync_power_state_interval: -1 -ironic_standalone_db_connection_string: "mysql+pymysql://{{ ironic_galera_user }}:{{ ironic_galera_password }}@{{ ironic_galera_address }}/ironic" +ironic_standalone_db_connection_string: "mysql+pymysql://{{ ironic_galera_user }}:{{ ironic_container_mysql_password }}@{{ ironic_galera_address }}/ironic" # Ironic db tuning ironic_db_max_overflow: 10 diff --git a/tests/test-install-ironic.yml b/tests/test-install-ironic.yml index 6160ac17..d3fc2cc6 100644 --- a/tests/test-install-ironic.yml +++ b/tests/test-install-ironic.yml @@ -47,7 +47,7 @@ login_password: "{{ galera_root_password }}" login_host: "localhost" name: "{{ ironic_galera_user }}" - password: "{{ ironic_galera_password }}" + password: "{{ ironic_container_mysql_password }}" host: "{{ item }}" state: "present" priv: "{{ ironic_galera_database }}.*:ALL" diff --git a/tests/test-vars.yml b/tests/test-vars.yml index a837cbfa..281c8fec 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -24,7 +24,7 @@ ironic_service_password: "secrete" ironic_galera_address: 10.100.100.101 ironic_galera_database: ironic ironic_galera_user: ironic -ironic_galera_password: "secrete" +ironic_container_mysql_password: "secrete" ironic_rabbitmq_password: "secrete" ironic_rabbitmq_userid: ironic ironic_rabbitmq_vhost: /ironic