Skip to content

JE-67504 #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 7, 2023
Merged

JE-67504 #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75f80f8
JE-67504
sych74 Sep 7, 2023
7ba4413
baseUrl
sych74 Sep 7, 2023
4403b5d
baseUrl
sych74 Sep 7, 2023
8b04572
Update manifest.yml
sych74 Sep 7, 2023
6832107
baseUrl
sych74 Sep 7, 2023
ee6d9c4
baseUrl
sych74 Sep 7, 2023
7812b3a
baseUrl
sych74 Sep 7, 2023
339cd9d
baseUrl
sych74 Sep 7, 2023
c5b5b81
JE-67504
sych74 Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion scripts/proxy-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ actions:
- cmd [proxy]: |-
mysql -h 127.0.0.1 -P3360 -uroot -e "DROP DATABASE IF EXISTS orchestrator;"
mysql -h 127.0.0.1 -P3360 -uroot -e "CREATE DATABASE IF NOT EXISTS orchestrator;"
mysql -h 127.0.0.1 -P3360 -uroot -e "GRANT ALL PRIVILEGES ON orchestrator.* TO 'admin'@'127.0.0.1' IDENTIFIED BY '${globals.ORCH_PASS}';"
major_version=$(rpm -qi mysql-community-server | grep Version | awk '{print $3}' | awk -F'.' '{print $1}');
if [ $major_version -ge 8 ]; then
mysql -h 127.0.0.1 -P3360 -uroot -e "ALTER USER 'admin'@'127.0.0.1' IDENTIFIED BY '${globals.ORCH_PASS}';"
else
mysql -h 127.0.0.1 -P3360 -uroot -e "SET PASSWORD FOR 'admin'@'127.0.0.1' = PASSWORD('${globals.ORCH_PASS}');"
fi
mysql -h 127.0.0.1 -P3360 -uroot -e "FLUSH PRIVILEGES;"
wget ${baseUrl}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log
sed -i -e 's|orc_client_user|${globals.DB_USER}|g' /etc/orchestrator.conf.json
sed -i -e 's|orc_client_password|${globals.DB_PASS}|g' /etc/orchestrator.conf.json
Expand Down
2 changes: 1 addition & 1 deletion scripts/proxy-galera.jps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id: mysql-proxy-galera-cluster
name: Galera/XtraDB Cluster with ProxySQL
description: Galera/XtraDB Cluster

baseUrl: https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0
baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster

success: /texts/proxy-entrypoint.md

Expand Down
2 changes: 1 addition & 1 deletion scripts/proxy-master-slave.jps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id: mysql-proxy-master-slave-cluster
name: MySQL/MariaDB/Percona Database Cluster with ProxySQL
description: ProxySQL Load Balancer Entry Point

baseUrl: https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0
baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster

success: /texts/proxy-entrypoint.md

Expand Down