From 8bc3490a4c72faf7d4385e93eefa887c9b1dabc2 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Fri, 23 Feb 2018 15:13:20 -0700 Subject: Add db.user and db.password to Openbook JSON Issue: IS-64 --- .../admin_api_server/files/admin_api_server.json | 4 +- .../ansible/files/env.yaml.openbook.example | 250 ++++++++++++--------- .../files/customer_api_server.json | 2 + .../files/create_openbook_schemas.sql.orig | 12 +- salt/openbook/database/files/fix_permissions.sh | 24 +- .../files/job_scheduler_server.json | 2 + .../workflow_server/files/workflow_server.json | 2 + 7 files changed, 172 insertions(+), 124 deletions(-) diff --git a/salt/openbook/admin_api_server/files/admin_api_server.json b/salt/openbook/admin_api_server/files/admin_api_server.json index cf47825..4cdb682 100644 --- a/salt/openbook/admin_api_server/files/admin_api_server.json +++ b/salt/openbook/admin_api_server/files/admin_api_server.json @@ -10,7 +10,9 @@ { "log.path": "{{ pillar["admin_api_server"]["log"] }}" {% raw %} -{% if "True" == openbook_install_admin_api_server|string() %} + {% if "True" == openbook_install_admin_api_server|string() %} + ,"db.user": "{{ openbook_database_user }}" + ,"db.password": "{{ openbook_database_password }}" ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" diff --git a/salt/openbook/ansible/files/env.yaml.openbook.example b/salt/openbook/ansible/files/env.yaml.openbook.example index 3d04366..a6c3b11 100644 --- a/salt/openbook/ansible/files/env.yaml.openbook.example +++ b/salt/openbook/ansible/files/env.yaml.openbook.example @@ -2,141 +2,181 @@ globals: ansible_ssh_user: root ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa - ansible_python_interpreter: /usr/bin/python openbook_docker_registry_url: ~ openbook_docker_registry_username: ~ openbook_docker_registry_password: ~ + openbook_database_user: openbook + openbook_database_password: ~ + openbook_disable_ssl_cert: True + openbook_ssl_cert: ~ + openbook_ssl_key: ~ + openbook_jwt_signature_key: ~ + openbook_auth_type: simple + openbook_role_group_mappings: ~ + openbook_galera_enabled: True environments: - unstable: - host1: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' - host2: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' - develop: - host1: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' - host2: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' - stage: - host1: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' - host2: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' - master: - host1: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' - host2: - openbook_database_password: ~ + openbook_wsrep_node_address: ~ openbook_gcomm_addresses: ~ - openbook_install_database: True|False - openbook_start_app: True|False - openbook_install_admin_api_server: True|False - openbook_install_customer_api_server: True|False - openbook_install_admin_web_ui: True|False - openbook_install_customer_web_ui: True|False - openbook_install_job_scheduler_server: True|False - openbook_install_workflow_server: True|False - openbook_admin_web_ui_port: ~ - openbook_admin_api_server_port: ~ - openbook_customer_web_ui_port: ~ - openbook_customer_api_server_port: ~ + openbook_install_database: True + openbook_start_app: True + openbook_install_admin_api_server: True + openbook_install_customer_api_server: True + openbook_install_admin_web_ui: True + openbook_install_customer_web_ui: True + openbook_install_job_scheduler_server: True + openbook_install_workflow_server: True + openbook_admin_web_ui_port: 8080 + openbook_admin_api_server_port: 8081 + openbook_customer_web_ui_port: 8082 + openbook_customer_api_server_port: 8083 + openbook_ssl_cert: /etc/ssl/certs/mon.vzwops.com.combined.crt + openbook_ssl_key: /etc/ssl/private/mon.vzwops.com.key openbook_jwt_signature_key: ~ + # openbook_auth_type: sso + # openbook_role_group_mappings: '{"RegionAdmin": ["CN=vcp-openstack-access,OU=Groups,DC=uswin,DC=ad,DC=vzwcorp,DC=com"]}' diff --git a/salt/openbook/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json index 67460a8..95b7427 100644 --- a/salt/openbook/customer_api_server/files/customer_api_server.json +++ b/salt/openbook/customer_api_server/files/customer_api_server.json @@ -11,6 +11,8 @@ "log.path": "{{ pillar["customer_api_server"]["log"] }}" {% raw %} {% if "True" == openbook_install_customer_api_server|string() %} + ,"db.user": "{{ openbook_database_user }}" + ,"db.password": "{{ openbook_database_password }}" ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" diff --git a/salt/openbook/database/files/create_openbook_schemas.sql.orig b/salt/openbook/database/files/create_openbook_schemas.sql.orig index 127e740..60f40b9 100644 --- a/salt/openbook/database/files/create_openbook_schemas.sql.orig +++ b/salt/openbook/database/files/create_openbook_schemas.sql.orig @@ -14,8 +14,8 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook` /*!40100 DEFAULT CHARACTER SET utf8 */; -GRANT ALL PRIVILEGES ON openbook.* TO openbook@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook.* TO openbook@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; FLUSH PRIVILEGES; USE `openbook`; @@ -2353,8 +2353,8 @@ DELIMITER ; CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook_jobs` /*!40100 DEFAULT CHARACTER SET utf8 */; -GRANT ALL PRIVILEGES ON openbook_jobs.* TO openbook@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_jobs.* TO openbook@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_jobs.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_jobs.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; FLUSH PRIVILEGES; USE `openbook_jobs`; @@ -2600,8 +2600,8 @@ UNLOCK TABLES; CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook_workflow` /*!40100 DEFAULT CHARACTER SET utf8 */; -GRANT ALL PRIVILEGES ON openbook_workflow.* TO openbook@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_workflow.* TO openbook@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_workflow.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_workflow.* TO {% raw %}{{ openbook_database_user }}{% endraw %}@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; FLUSH PRIVILEGES; USE `openbook_workflow`; diff --git a/salt/openbook/database/files/fix_permissions.sh b/salt/openbook/database/files/fix_permissions.sh index 9eff79c..f2ce525 100644 --- a/salt/openbook/database/files/fix_permissions.sh +++ b/salt/openbook/database/files/fix_permissions.sh @@ -21,18 +21,18 @@ GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ ope GRANT ALL PRIVILEGES ON *.* TO 'root'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook.* TO 'openbook'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_jobs.* TO 'openbook'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; -GRANT ALL PRIVILEGES ON openbook_workflow.* TO 'openbook'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_jobs.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'localhost' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'127.0.0.1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'::1' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; +GRANT ALL PRIVILEGES ON openbook_workflow.* TO '{% raw %}{{ openbook_database_user }}{% endraw %}'@'%' IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; FLUSH PRIVILEGES; EOF diff --git a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json index fa06af4..49dc9ef 100644 --- a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json +++ b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json @@ -11,6 +11,8 @@ "log.path": "{{ pillar["job_scheduler_server"]["log"] }}" {% raw %} {% if "True" == openbook_install_job_scheduler_server|string() %} + ,"db.user": "{{ openbook_database_user }}" + ,"db.password": "{{ openbook_database_password }}" ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] diff --git a/salt/openbook/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json index b9a9521..37e3026 100644 --- a/salt/openbook/workflow_server/files/workflow_server.json +++ b/salt/openbook/workflow_server/files/workflow_server.json @@ -11,6 +11,8 @@ "log.path": "{{ pillar["workflow_server"]["log"] }}" {% raw %} {% if "True" == openbook_install_workflow_server|string() %} + ,"db.user": "{{ openbook_database_user }}" + ,"db.password": "{{ openbook_database_password }}" ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] -- cgit v1.3