Skip to content

Commit 6301859

Browse files
committed
RabbitMQ support
1 parent 8713bb9 commit 6301859

File tree

6 files changed

+38
-15
lines changed

6 files changed

+38
-15
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Upon a successful installation, you'll see the location and URL of the newly-ins
141141
- Access storefront at `http://<ip-from-config-yaml>`
142142
- Access admin panel at `http://<ip-from-config-yaml>/admin/`
143143
- Magento admin user/password: `admin/123123q`
144-
<!--- Rabbit MQ control panel: `http://<ip-from-config-yaml>:15672`, credentials `guest`/`guest`-->
144+
- Rabbit MQ control panel: run `bash k-open-rabbitmq`, credentials `admin`/`123123q`
145145
146146
:information_source: Your admin URL, storefront URL, and admin user and password are located in `etc/config.yaml`.
147147

Diff for: etc/helm/requirements.lock

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@ dependencies:
55
- name: redis
66
repository: https://kubernetes-charts.storage.googleapis.com
77
version: 5.0.0
8-
digest: sha256:3c0e99a51b20812dfe0d407e8f4ee6ed1a9c2469bc2320d115e5fda0c538340b
9-
generated: 2019-01-11T20:39:26.594816-06:00
8+
- name: rabbitmq
9+
repository: https://kubernetes-charts.storage.googleapis.com
10+
version: 3.6.3
11+
digest: sha256:c75abdd584e0aa2ac7d476f1641aa9fe1f18a9526114a0b5a075266ee62fb47f
12+
generated: 2019-01-31T20:07:53.996726-06:00

Diff for: etc/helm/requirements.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ dependencies:
66
- name: redis
77
repository: "@stable"
88
version: "5.0"
9+
- name: rabbitmq
10+
repository: "@stable"
11+
version: "3.6.3"
912
- name: checkout
1013
repository: http://localhost:10191
1114
version: 0.1.0

Diff for: etc/helm/values.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,9 @@ redis:
7272
usePassword: false
7373
master:
7474
disableCommands: []
75+
76+
rabbitmq:
77+
serviceType: NodePort
78+
rabbitmq:
79+
username: admin
80+
password: 123123q

Diff for: k-open-rabbitmq

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
cd "$(dirname "${BASH_SOURCE[0]}")" && vagrant_dir=$PWD
6+
7+
source "${vagrant_dir}/scripts/functions.sh"
8+
9+
rabbitmq_url="$(minikube service magento2-rabbitmq --url)"
10+
open ${rabbitmq_url}

Diff for: scripts/guest/m-reinstall

+13-12
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ setupOptions[base_url]="http://${magento_host_name}/"
2525
setupOptions[admin_lastname]='Admin'
2626
setupOptions[admin_firstname]='Admin'
2727
setupOptions[admin_email]='[email protected]'
28-
setupOptions[amqp_host]='localhost'
28+
setupOptions[amqp_host]='magento2-rabbitmq'
2929
setupOptions[amqp_port]='5672'
30-
setupOptions[amqp_user]='guest'
31-
setupOptions[amqp_password]='guest'
30+
setupOptions[amqp_user]='admin'
31+
setupOptions[amqp_password]='123123q'
3232
setupOptions[amqp_virtualhost]='/'
3333

3434
#if [[ ${is_windows_host} == 1 ]] || [[ ${use_nfs} == 0 ]]; then
@@ -82,15 +82,16 @@ install_cmd="./bin/magento setup:install \
8282
--use-rewrites=1"
8383

8484
# Configure Rabbit MQ
85-
# TODO: Enable Rabbit MQ
86-
#if [[ -d "${MAGENTO_ROOT}/app/code/Magento/MessageQueue" ]] || [[ -d "${MAGENTO_ROOT}/vendor/magento/module-message-queue" ]]; then
87-
# install_cmd="${install_cmd} \
88-
# --amqp-host=${setupOptions[amqp_host]} \
89-
# --amqp-port=${setupOptions[amqp_port]} \
90-
# --amqp-user=${setupOptions[amqp_user]} \
91-
# --amqp-virtualhost=${setupOptions[amqp_virtualhost]} \
92-
# --amqp-password=${setupOptions[amqp_password]}"
93-
#fi
85+
if [[ -d "${MAGENTO_ROOT}/app/code/Magento/MessageQueue" ]] || [[ -d "${MAGENTO_ROOT}/vendor/magento/module-message-queue" ]]; then
86+
install_cmd="${install_cmd} \
87+
--amqp-host=${setupOptions[amqp_host]} \
88+
--amqp-port=${setupOptions[amqp_port]} \
89+
--amqp-user=${setupOptions[amqp_user]} \
90+
--amqp-virtualhost=${setupOptions[amqp_virtualhost]} \
91+
--amqp-ssl=false \
92+
--amqp-ssl-options=[] \
93+
--amqp-password=${setupOptions[amqp_password]}"
94+
fi
9495

9596
# TODO: Permission denied
9697
#sudo chmod +x bin/magento

0 commit comments

Comments
 (0)