summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/mq
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2015-08-06 02:37:33 -0400
committerbaigk <baiguoku@huawei.com>2015-08-09 22:47:56 -0400
commit87612abc0e24cafd89a49e350165b08fe1608233 (patch)
tree07b156c0268fd189f92e8a0730118edc51b8073f /deploy/adapters/ansible/roles/mq
parent5aedf594112c0749b6e9039d15b9fe70d210a942 (diff)
support deployment openstack juno with ansible for compass in centos7.1
JIRA: COMPASS-6 Change-Id: I8ef865e8acfe29c3ff5c7e9030e4cebabed3457b Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/mq')
-rw-r--r--deploy/adapters/ansible/roles/mq/tasks/rabbitmq.yml4
-rw-r--r--deploy/adapters/ansible/roles/mq/vars/Debian.yml6
-rw-r--r--deploy/adapters/ansible/roles/mq/vars/RedHat.yml4
-rw-r--r--deploy/adapters/ansible/roles/mq/vars/main.yml6
4 files changed, 14 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/roles/mq/tasks/rabbitmq.yml b/deploy/adapters/ansible/roles/mq/tasks/rabbitmq.yml
index 9e574c18..edfc8a7a 100644
--- a/deploy/adapters/ansible/roles/mq/tasks/rabbitmq.yml
+++ b/deploy/adapters/ansible/roles/mq/tasks/rabbitmq.yml
@@ -7,7 +7,7 @@
- name: install rabbitmq-server
action: "{{ ansible_pkg_mgr }} name=rabbitmq-server state=present"
- with_items: packages
+ with_items: packages | union(packages_noarch)
- name: stop rabbitmq-server
service: name=rabbitmq-server
@@ -27,7 +27,7 @@
- name: generate mq service list
shell: echo {{ item }} >> /opt/service
- with_items: services
+ with_items: services_noarch
- name: modify rabbitmq password
command: rabbitmqctl change_password guest {{ RABBIT_PASS }}
diff --git a/deploy/adapters/ansible/roles/mq/vars/Debian.yml b/deploy/adapters/ansible/roles/mq/vars/Debian.yml
index a9a9ac4f..c233bda3 100644
--- a/deploy/adapters/ansible/roles/mq/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/mq/vars/Debian.yml
@@ -1,6 +1,4 @@
---
-packages:
- - rabbitmq-server
+services: []
+packages: []
-services:
- - "rabbitmq-server"
diff --git a/deploy/adapters/ansible/roles/mq/vars/RedHat.yml b/deploy/adapters/ansible/roles/mq/vars/RedHat.yml
new file mode 100644
index 00000000..c233bda3
--- /dev/null
+++ b/deploy/adapters/ansible/roles/mq/vars/RedHat.yml
@@ -0,0 +1,4 @@
+---
+services: []
+packages: []
+
diff --git a/deploy/adapters/ansible/roles/mq/vars/main.yml b/deploy/adapters/ansible/roles/mq/vars/main.yml
new file mode 100644
index 00000000..2c48a648
--- /dev/null
+++ b/deploy/adapters/ansible/roles/mq/vars/main.yml
@@ -0,0 +1,6 @@
+---
+packages_noarch:
+ - rabbitmq-server
+
+services_noarch:
+ - rabbitmq-server