Remove unnecessary RabbitMQ setup/vars
It would appear that blazar does not make use of rabbitmq, so we remove the vhost/user setup and vars. Change-Id: I3aa2a7e38fcd78212b4b88aa2b7bb28d598eaf7f
This commit is contained in:
parent
c7bc980de3
commit
57d0799ba7
|
@ -14,14 +14,9 @@
|
|||
# limitations under the License.
|
||||
|
||||
# Use the tests repo values
|
||||
blazar_rabbitmq_port: "{{ rabbitmq_port }}"
|
||||
blazar_rabbitmq_servers: "{{ rabbitmq_servers }}"
|
||||
blazar_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
|
||||
blazar_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
|
||||
blazar_galera_address: "{{ test_galera_host }}"
|
||||
|
||||
# Required settings with no defaults
|
||||
blazar_rabbitmq_password: "secrete"
|
||||
blazar_service_password: "secrete"
|
||||
blazar_container_mysql_password: "secrete"
|
||||
|
||||
|
@ -32,4 +27,4 @@ blazar_developer_mode: true
|
|||
# override them to the container address.
|
||||
blazar_service_publicuri: "{{ blazar_service_proto }}://{{ hostvars[groups['blazar_all'][0]]['ansible_host'] }}:{{ blazar_service_port }}"
|
||||
blazar_service_internaluri: "{{ blazar_service_publicuri }}"
|
||||
blazar_service_adminuri: "{{ blazar_service_publicuri }}"
|
||||
blazar_service_adminuri: "{{ blazar_service_publicuri }}"
|
||||
|
|
|
@ -18,14 +18,6 @@
|
|||
user: root
|
||||
gather_facts: true
|
||||
any_errors_fatal: true
|
||||
pre_tasks:
|
||||
- include: common/ensure-rabbitmq.yml
|
||||
vhost_name: "{{ blazar_rabbitmq_vhost }}"
|
||||
user_name: "{{ cblazar_rabbitmq_userid }}"
|
||||
user_password: "{{ blazar_rabbitmq_password }}"
|
||||
when:
|
||||
- "groups['rabbitmq_all'] is defined"
|
||||
|
||||
roles:
|
||||
- role: "os_blazar"
|
||||
vars_files:
|
||||
|
|
Loading…
Reference in New Issue