Updated from OpenStack Ansible Tests

Change-Id: I2d778b43e884139636354d0559ca4462749aa6a3
This commit is contained in:
OpenStack Proposal Bot 2019-06-27 10:22:48 +00:00
parent dcdeb98468
commit 9df98e87bb
2 changed files with 11 additions and 8 deletions

8
Vagrantfile vendored
View File

@ -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

View File

@ -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 }}"