Updated from OpenStack Ansible Tests
Change-Id: I1db75e2e7cb4b9656cdde2c1f4b8f8c472291081
This commit is contained in:
parent
4d906711ec
commit
2e07702b34
8
Vagrantfile
vendored
8
Vagrantfile
vendored
@ -41,14 +41,14 @@ Vagrant.configure(2) do |config|
|
|||||||
bionic.vm.box = "ubuntu/bionic64"
|
bionic.vm.box = "ubuntu/bionic64"
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.define "opensuse423" do |leap423|
|
|
||||||
leap423.vm.box = "opensuse/openSUSE-42.3-x86_64"
|
|
||||||
end
|
|
||||||
|
|
||||||
config.vm.define "opensuse150" do |leap150|
|
config.vm.define "opensuse150" do |leap150|
|
||||||
leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
|
leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
config.vm.define "opensuse151" do |leap151|
|
||||||
|
leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
|
||||||
|
end
|
||||||
|
|
||||||
config.vm.define "centos7" do |centos7|
|
config.vm.define "centos7" do |centos7|
|
||||||
centos7.vm.box = "centos/7"
|
centos7.vm.box = "centos/7"
|
||||||
end
|
end
|
||||||
|
@ -67,7 +67,8 @@
|
|||||||
name: "{{ _oslomsg_notify_vhost }}"
|
name: "{{ _oslomsg_notify_vhost }}"
|
||||||
state: "present"
|
state: "present"
|
||||||
when:
|
when:
|
||||||
- _oslomsg_notify_vhost != _oslomsg_rpc_vhost
|
- (_oslomsg_rpc_vhost is undefined) or
|
||||||
|
(_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
|
||||||
|
|
||||||
- name: Apply Notify RabbitMQ vhost policies
|
- name: Apply Notify RabbitMQ vhost policies
|
||||||
rabbitmq_policy:
|
rabbitmq_policy:
|
||||||
@ -78,21 +79,23 @@
|
|||||||
vhost: "{{ _oslomsg_notify_vhost }}"
|
vhost: "{{ _oslomsg_notify_vhost }}"
|
||||||
loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
|
loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
|
||||||
when:
|
when:
|
||||||
- _oslomsg_notify_vhost != _oslomsg_rpc_vhost
|
- (_oslomsg_rpc_vhost is undefined) or
|
||||||
|
(_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
|
||||||
|
|
||||||
- name: Add Notify RabbitMQ user
|
- name: Add Notify RabbitMQ user
|
||||||
rabbitmq_user:
|
rabbitmq_user:
|
||||||
user: "{{ _oslomsg_notify_userid }}"
|
user: "{{ _oslomsg_notify_userid }}"
|
||||||
password: "{{ _oslomsg_notify_password }}"
|
password: "{{ _oslomsg_notify_password }}"
|
||||||
|
update_password: always
|
||||||
vhost: "{{ _oslomsg_notify_vhost }}"
|
vhost: "{{ _oslomsg_notify_vhost }}"
|
||||||
configure_priv: ".*"
|
configure_priv: ".*"
|
||||||
read_priv: ".*"
|
read_priv: ".*"
|
||||||
write_priv: ".*"
|
write_priv: ".*"
|
||||||
state: "present"
|
state: "present"
|
||||||
force: true
|
|
||||||
no_log: true
|
no_log: true
|
||||||
when:
|
when:
|
||||||
- _oslomsg_notify_userid != _oslomsg_rpc_userid
|
- (_oslomsg_rpc_userid is undefined) or
|
||||||
|
(_oslomsg_notify_userid != _oslomsg_rpc_userid)
|
||||||
|
|
||||||
- name: Setup RPC MQ Service (Qdrouterd)
|
- name: Setup RPC MQ Service (Qdrouterd)
|
||||||
delegate_to: "{{ _oslomsg_rpc_setup_host }}"
|
delegate_to: "{{ _oslomsg_rpc_setup_host }}"
|
||||||
|
Loading…
Reference in New Issue
Block a user