Merge "Remove all MQ vhost/user creation tasks/vars"

ensure-oslomsg.yml

@@ -1,76 +0,0 @@
----
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Ensure RPC Rabbitmq vhost
-  rabbitmq_vhost:
-    name: "{{ rpc_vhost }}"
-    state: "present"
-  delegate_to: "{{ groups['oslomsg_rpc_all'][0] }}"
-  run_once: True
-  when:
-    - oslomsg_rpc_transport == "rabbit"
-
-- name: Ensure RPC Rabbitmq user
-  rabbitmq_user:
-    user: "{{ rpc_user }}"
-    password: "{{ rpc_password }}"
-    vhost: "{{ rpc_vhost }}"
-    configure_priv: ".*"
-    read_priv: ".*"
-    write_priv: ".*"
-    state: "present"
-  delegate_to: "{{ groups['oslomsg_rpc_all'][0] }}"
-  run_once: True
-  no_log: true
-  when:
-    - oslomsg_rpc_transport == "rabbit"
-
-- name: Ensure Notify Rabbitmq vhost
-  rabbitmq_vhost:
-    name: "{{ notify_vhost }}"
-    state: "present"
-  delegate_to: "{{ groups['oslomsg_notify_all'][0] }}"
-  run_once: True
-  when:
-    - oslomsg_notify_transport == "rabbit"
-
-- name: Ensure Notify Rabbitmq user
-  rabbitmq_user:
-    user: "{{ notify_user }}"
-    password: "{{ notify_password }}"
-    vhost: "{{ notify_vhost }}"
-    configure_priv: ".*"
-    read_priv: ".*"
-    write_priv: ".*"
-    state: "present"
-  delegate_to: "{{ groups['oslomsg_notify_all'][0] }}"
-  run_once: True
-  no_log: true
-  when:
-    - oslomsg_notify_transport == "rabbit"
-
-- name: Ensure RPC qdrouterd vhost
-  command: echo "create qdrouterd vhost"
-  delegate_to: "{{ groups['oslomsg_rpc_all'][0] }}"
-  run_once: True
-  when:
-    - oslomsg_rpc_transport == "amqp"
-
-- name: Ensure RPC qdrouterd user
-  command: echo "create qdrouterd user"
-  delegate_to: "{{ groups['oslomsg_rpc_all'][0] }}"
-  run_once: True
-  when:
-    - oslomsg_rpc_transport == "amqp"

ensure-rabbitmq.yml

@@ -1,32 +0,0 @@
----
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-- name: Ensure rabbitmq vhost
-  rabbitmq_vhost:
-    name: "{{ vhost_name }}"
-    state: "present"
-  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
-  run_once: True
-- name: Ensure rabbitmq user
-  rabbitmq_user:
-    user: "{{ user_name }}"
-    password: "{{ user_password }}"
-    vhost: "{{ vhost_name }}"
-    configure_priv: ".*"
-    read_priv: ".*"
-    write_priv: ".*"
-    state: "present"
-  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
-  run_once: True
-  no_log: true

test-install-cinder.yml

@@ -18,41 +18,17 @@
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  pre_tasks:
-
-    - include: ensure-rabbitmq.yml
-      vhost_name: "{{ cinder_rabbitmq_vhost }}"
-      user_name: "{{ cinder_rabbitmq_userid }}"
-      user_password: "{{ cinder_rabbitmq_password }}"
-      when:
-        - "'rabbitmq_all' in groups"
-        - "groups['rabbitmq_all'] | length > 0"
-        - "'oslomsg_rpc_all' not in groups"
-
-    - include: ensure-oslomsg.yml
-      rpc_vhost: "{{ cinder_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ cinder_oslomsg_rpc_userid }}"
-      rpc_password: "{{ cinder_oslomsg_rpc_password }}"
-      notify_vhost: "{{ cinder_oslomsg_notify_vhost }}"
-      notify_user: "{{ cinder_oslomsg_notify_userid }}"
-      notify_password: "{{ cinder_oslomsg_notify_password }}"
-      when:
-        - "'oslomsg_rpc_all' in groups"
-        - "groups['oslomsg_rpc_all'] | length > 0"
-
-  roles:
-    - role: "os_cinder"
   vars_files:
     - test-vars.yml
-
-
+  roles:
+    - role: "os_cinder"
 
 - name: Deploy the rest of cinder
   hosts: "cinder_all:!cinder_api"
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  roles:
-    - role: "os_cinder"
   vars_files:
     - test-vars.yml
+  roles:
+    - role: "os_cinder"

test-install-heat.yml

@@ -18,28 +18,7 @@
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  pre_tasks:
-    - include: ensure-rabbitmq.yml
-      vhost_name: "{{ heat_rabbitmq_vhost }}"
-      user_name: "{{ heat_rabbitmq_userid }}"
-      user_password: "{{ heat_rabbitmq_password }}"
-      when:
-        - "'rabbitmq_all' in groups"
-        - "groups['rabbitmq_all'] | length > 0"
-        - "'oslomsg_rpc_all' not in groups"
-
-    - include: ensure-oslomsg.yml
-      rpc_vhost: "{{ heat_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ heat_oslomsg_rpc_userid }}"
-      rpc_password: "{{ heat_oslomsg_rpc_password }}"
-      notify_vhost: "{{ heat_oslomsg_notify_vhost }}"
-      notify_user: "{{ heat_oslomsg_notify_userid }}"
-      notify_password: "{{ heat_oslomsg_notify_password }}"
-      when:
-        - "'oslomsg_rpc_all' in groups"
-        - "groups['oslomsg_rpc_all'] | length > 0"
-
-  roles:
-    - role: "os_heat"
   vars_files:
     - test-vars.yml
+  roles:
+    - role: "os_heat"

test-install-ironic.yml

@@ -18,28 +18,7 @@
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  pre_tasks:
-    - include: ensure-rabbitmq.yml
-      vhost_name: "{{ ironic_rabbitmq_vhost }}"
-      user_name: "{{ ironic_rabbitmq_userid }}"
-      user_password: "{{ ironic_rabbitmq_password }}"
-      when:
-        - "'rabbitmq_all' in groups"
-        - "groups['rabbitmq_all'] | length > 0"
-        - "'oslomsg_rpc_all' not in groups"
-
-    - include: ensure-oslomsg.yml
-      rpc_vhost: "{{ ironic_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ ironic_oslomsg_rpc_userid }}"
-      rpc_password: "{{ ironic_oslomsg_rpc_password }}"
-      notify_vhost: "{{ ironic_oslomsg_notify_vhost }}"
-      notify_user: "{{ ironic_oslomsg_notify_userid }}"
-      notify_password: "{{ ironic_oslomsg_notify_password }}"
-      when:
-        - "'oslomsg_rpc_all' in groups"
-        - "groups['oslomsg_rpc_all'] | length > 0"
-
-  roles:
-    - role: "os_ironic"
   vars_files:
     - test-vars.yml
+  roles:
+    - role: "os_ironic"

test-install-keystone.yml

@@ -21,29 +21,6 @@
   vars_files:
     - test-vars.yml
   tasks:
-    - name: Set keystone_messaging fact
-      set_fact:
-        keystone_messaging_enabled: "{{ groups['rabbitmq_all'] is defined }}"
-
-    - include: ensure-rabbitmq.yml
-      vhost_name: "{{ keystone_rabbitmq_vhost }}"
-      user_name: "{{ keystone_rabbitmq_userid }}"
-      user_password: "{{ keystone_rabbitmq_password }}"
-      when:
-        - "'rabbitmq_all' in groups"
-        - "groups['rabbitmq_all'] | length > 0"
-        - "'oslomsg_rpc_all' not in groups"
-
-    - include: ensure-oslomsg.yml
-      rpc_vhost: "{{ keystone_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ keystone_oslomsg_rpc_userid }}"
-      rpc_password: "{{ keystone_oslomsg_rpc_password }}"
-      notify_vhost: "{{ keystone_oslomsg_notify_vhost }}"
-      notify_user: "{{ keystone_oslomsg_notify_userid }}"
-      notify_password: "{{ keystone_oslomsg_notify_password }}"
-      when:
-        - "'oslomsg_rpc_all' in groups"
-        - "groups['oslomsg_rpc_all'] | length > 0"
 
 - name: Playbook for deploying keystone
   hosts: keystone_all

test-install-neutron.yml

@@ -83,26 +83,6 @@
       retries: 5
       delay: 2
 
-    - include: ensure-rabbitmq.yml
-      vhost_name: "{{ neutron_rabbitmq_vhost }}"
-      user_name: "{{ neutron_rabbitmq_userid }}"
-      user_password: "{{ neutron_rabbitmq_password }}"
-      when:
-        - "'rabbitmq_all' in groups"
-        - "groups['rabbitmq_all'] | length > 0"
-        - "'oslomsg_rpc_all' not in groups"
-
-    - include: ensure-oslomsg.yml
-      rpc_vhost: "{{ neutron_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ neutron_oslomsg_rpc_userid }}"
-      rpc_password: "{{ neutron_oslomsg_rpc_password }}"
-      notify_vhost: "{{ neutron_oslomsg_notify_vhost }}"
-      notify_user: "{{ neutron_oslomsg_notify_userid }}"
-      notify_password: "{{ neutron_oslomsg_notify_password }}"
-      when:
-        - "'oslomsg_rpc_all' in groups"
-        - "groups['oslomsg_rpc_all'] | length > 0"
-
 
 
 - name: Deploy neutron server
@@ -110,7 +90,7 @@
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  roles:
-    - role: "os_neutron"
   vars_files:
     - test-vars.yml
+  roles:
+    - role: "os_neutron"

test-install-nova.yml

@@ -56,42 +56,24 @@
         name: "{{ required_packages[ansible_pkg_mgr] }}"
         state: present
 
-    - include: ensure-rabbitmq.yml
-      vhost_name: "{{ nova_rabbitmq_vhost }}"
-      user_name: "{{ nova_rabbitmq_userid }}"
-      user_password: "{{ nova_rabbitmq_password }}"
-      when:
-        - "'rabbitmq_all' in groups"
-        - "groups['rabbitmq_all'] | length > 0"
-        - "'oslomsg_rpc_all' not in groups"
 
-    - include: ensure-oslomsg.yml
-      rpc_vhost: "{{ nova_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ nova_oslomsg_rpc_userid }}"
-      rpc_password: "{{ nova_oslomsg_rpc_password }}"
-      notify_vhost: "{{ nova_oslomsg_notify_vhost }}"
-      notify_user: "{{ nova_oslomsg_notify_userid }}"
-      notify_password: "{{ nova_oslomsg_notify_password }}"
-      when:
-        - "'oslomsg_rpc_all' in groups"
-        - "groups['oslomsg_rpc_all'] | length > 0"
 
 - name: Deploy nova control plane
   hosts: "nova_all:!nova_compute"
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  roles:
-    - role: "os_nova"
   vars_files:
     - test-vars.yml
+  roles:
+    - role: "os_nova"
 
 - name: Deploy nova compute
   hosts: "nova_compute"
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  roles:
-    - role: "os_nova"
   vars_files:
     - test-vars.yml
+  roles:
+    - role: "os_nova"

test-install-sahara.yml

@@ -13,32 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Playbook for installing Ironic
+- name: Playbook for installing Sahara
   hosts: sahara_all
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  pre_tasks:
-    - include: ensure-rabbitmq.yml
-      vhost_name: "{{ sahara_rabbitmq_vhost }}"
-      user_name: "{{ sahara_rabbitmq_userid }}"
-      user_password: "{{ sahara_rabbitmq_password }}"
-      when:
-        - "'rabbitmq_all' in groups"
-        - "groups['rabbitmq_all'] | length > 0"
-        - "'oslomsg_rpc_all' not in groups"
-
-    - include: ensure-oslomsg.yml
-      rpc_vhost: "{{ sahara_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ sahara_oslomsg_rpc_userid }}"
-      rpc_password: "{{ sahara_oslomsg_rpc_password }}"
-      notify_vhost: "{{ sahara_oslomsg_notify_vhost }}"
-      notify_user: "{{ sahara_oslomsg_notify_userid }}"
-      notify_password: "{{ sahara_oslomsg_notify_password }}"
-      when:
-        - "'oslomsg_rpc_all' in groups"
-        - "groups['oslomsg_rpc_all'] | length > 0"
-  roles:
-    - role: "os_sahara"
   vars_files:
     - test-vars.yml
+  roles:
+    - role: "os_sahara"

test-vars.yml

@@ -99,7 +99,6 @@ oslomsg_rpc_port: "{{ rabbitmq_port }}"
 oslomsg_rpc_servers: "{{ rabbitmq_servers }}"
 oslomsg_rpc_use_ssl: "{{ rabbitmq_use_ssl }}"
 oslomsg_rpc_host_group: "{{ test_rabbitmq_group }}"
-oslomsg_rpc_ssl_param: "{{ (oslomsg_rpc_use_ssl | bool) | ternary(1, 0) }}"
 oslomsg_rpc_password: "{{ rabbitmq_password }}"
 
 # Oslo Messaging Notify Settings
@@ -108,7 +107,6 @@ oslomsg_notify_port: "{{ rabbitmq_port }}"
 oslomsg_notify_servers: "{{ rabbitmq_servers }}"
 oslomsg_notify_use_ssl: "{{ rabbitmq_use_ssl }}"
 oslomsg_notify_host_group: "{{ test_rabbitmq_group }}"
-oslomsg_notify_ssl_param: "{{ (oslomsg_notify_use_ssl | bool) | ternary(1, 0) }}"
 oslomsg_notify_password: "{{ rabbitmq_password }}"
 
 # Memcache Settings
@@ -132,25 +130,7 @@ keystone_service_adminuri: "http://{{ test_keystone_host }}:5000"
 keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"
 keystone_service_password: "secrete"
 keystone_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-keystone_oslomsg_rpc_userid: keystone
-keystone_oslomsg_rpc_vhost: /keystone
-keystone_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
-keystone_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-keystone_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-keystone_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 keystone_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-keystone_oslomsg_notify_userid: keystone
-keystone_oslomsg_notify_vhost: /keystone
-keystone_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-keystone_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-keystone_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-keystone_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-keystone_rabbitmq_password: "{{ rabbitmq_password }}"
-keystone_rabbitmq_port: "{{ rabbitmq_port }}"
-keystone_rabbitmq_servers: "{{ rabbitmq_servers }}"
-keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-keystone_rabbitmq_userid: keystone
-keystone_rabbitmq_vhost: /keystone
 keystone_container_mysql_password: "SuperSecrete"
 keystone_venv_tag: "testing"
 keystone_developer_mode: true
@@ -193,25 +173,7 @@ nova_metadata_proxy_secret: "secrete"
 nova_novncproxy_vncserver_listen: localhost
 nova_novncproxy_vncserver_proxyclient_address: localhost
 nova_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-nova_oslomsg_rpc_userid: nova
-nova_oslomsg_rpc_vhost: /nova
-nova_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
-nova_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-nova_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-nova_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 nova_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-nova_oslomsg_notify_userid: nova
-nova_oslomsg_notify_vhost: /nova
-nova_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-nova_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-nova_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-nova_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-nova_rabbitmq_password: "{{ rabbitmq_password }}"
-nova_rabbitmq_port:  "{{ rabbitmq_port }}"
-nova_rabbitmq_servers: "{{ rabbitmq_servers }}"
-nova_rabbitmq_userid: nova
-nova_rabbitmq_vhost: /nova
-nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
 nova_program_name: nova-api-os-compute
 nova_service_adminuri: "http://{{ test_nova_api_compute_host }}:8774"
 nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1"
@@ -249,25 +211,7 @@ neutron_git_install_branch: "{{ test_branch }}"
 neutron_ha_vrrp_auth_password: secrete
 neutron_management_address: "{{ test_neutron_server_host }}"
 neutron_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-neutron_oslomsg_rpc_userid: neutron
-neutron_oslomsg_rpc_vhost: /neutron
-neutron_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
-neutron_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-neutron_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-neutron_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 neutron_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-neutron_oslomsg_notify_userid: neutron
-neutron_oslomsg_notify_vhost: /neutron
-neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-neutron_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-neutron_rabbitmq_password: "{{ rabbitmq_password }}"
-neutron_rabbitmq_port:  "{{ rabbitmq_port }}"
-neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
-neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-neutron_rabbitmq_userid: neutron
-neutron_rabbitmq_vhost: /neutron
 neutron_service_publicuri: "http://{{ test_neutron_server_host }}:9696"
 neutron_service_publicurl: "{{ neutron_service_publicuri }}"
 neutron_service_adminuri: "http://{{ test_neutron_server_host }}:9696"
@@ -294,25 +238,7 @@ cinder_git_install_branch: "{{ test_branch }}"
 cinder_glance_api_servers: "http://{{ test_glance_host }}:9292"
 cinder_profiler_hmac_key: "secrete"
 cinder_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-cinder_oslomsg_rpc_userid: cinder
-cinder_oslomsg_rpc_vhost: /cinder
-cinder_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
-cinder_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-cinder_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-cinder_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 cinder_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-cinder_oslomsg_notify_userid: cinder
-cinder_oslomsg_notify_vhost: /cinder
-cinder_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-cinder_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-cinder_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-cinder_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-cinder_rabbitmq_port: "{{ rabbitmq_port }}"
-cinder_rabbitmq_servers: "{{ rabbitmq_servers }}"
-cinder_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-cinder_rabbitmq_password: "{{ rabbitmq_password }}"
-cinder_rabbitmq_userid: cinder
-cinder_rabbitmq_vhost: /cinder
 cinder_service_password: "secrete"
 cinder_venv_tag: "testing"
 cinder_service_port: 8776
@@ -381,25 +307,7 @@ heat_stack_domain_admin_password: secrete
 heat_auth_encryption_key: 32characterslongboguskeyvaluefoo
 heat_container_mysql_password: "SuperSecrete"
 heat_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-heat_oslomsg_rpc_userid: heat
-heat_oslomsg_rpc_vhost: /heat
-heat_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
-heat_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-heat_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-heat_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 heat_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-heat_oslomsg_notify_userid: heat
-heat_oslomsg_notify_vhost: /heat
-heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-heat_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-heat_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-heat_rabbitmq_servers: "{{ rabbitmq_servers }}"
-heat_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-heat_rabbitmq_port: "{{ rabbitmq_port }}"
-heat_rabbitmq_password: "{{ rabbitmq_password }}"
-heat_rabbitmq_userid: heat
-heat_rabbitmq_vhost: /heat
 
 # Gnocchi specific settings
 gnocchi_venv_tag: "testing"
@@ -427,26 +335,7 @@ ironic_service_name: ironic
 ironic_service_project_name: "service"
 ironic_container_mysql_password: "secrete"
 ironic_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-ironic_oslomsg_rpc_userid: ironic
-ironic_oslomsg_rpc_vhost: /ironic
-ironic_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
-ironic_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-ironic_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-ironic_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 ironic_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-ironic_oslomsg_notify_userid: ironic
-ironic_oslomsg_notify_vhost: /ironic
-ironic_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-ironic_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-ironic_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-ironic_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-ironic_rabbitmq_password: "{{ rabbitmq_password }}"
-ironic_rabbitmq_userid: ironic
-ironic_rabbitmq_vhost: /ironic
-ironic_rabbitmq_servers: "{{ rabbitmq_servers }}"
-ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-ironic_rabbitmq_port: "{{ rabbitmq_port }}"
-ironic_standalone: False
 ironic_swift_temp_url_secret_key: secrete
 ironic_keystone_auth_plugin: password
 ironic_glance_api_servers: "http://{{ test_glance_host }}:9292"
@@ -465,25 +354,7 @@ sahara_service_adminuri: "http://{{ test_sahara_host }}:{{ sahara_service_port }
 sahara_service_adminurl: "{{ sahara_service_adminuri }}/v1.1/%(tenant_id)s"
 sahara_container_mysql_password: "SuperSecrete"
 sahara_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-sahara_oslomsg_rpc_userid: sahara
-sahara_oslomsg_rpc_vhost: /sahara
-sahara_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
-sahara_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-sahara_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-sahara_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 sahara_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-sahara_oslomsg_notify_userid: sahara
-sahara_oslomsg_notify_vhost: /sahara
-sahara_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-sahara_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-sahara_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-sahara_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-sahara_rabbitmq_servers: "{{ rabbitmq_servers }}"
-sahara_rabbitmq_port: "{{ rabbitmq_port }}"
-sahara_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-sahara_rabbitmq_password: "secrete"
-sahara_rabbitmq_userid: sahara
-sahara_rabbitmq_vhost: /sahara
 sahara_bin: "/openstack/venvs/sahara-{{ sahara_venv_tag }}/bin"
 
 # Horizon Settings
@@ -491,9 +362,6 @@ horizon_developer_mode: true
 horizon_venv_tag: "testing"
 horizon_git_install_branch: "{{ test_branch }}"
 horizon_requirements_git_install_branch: "{{ test_branch }}"
-horizon_rabbitmq_password: "secrete"
-horizon_rabbitmq_userid: horizon
-horizon_rabbitmq_vhost: /horizon
 horizon_container_mysql_password: "SuperSecrete"
 horizon_secret_key: "SuperSecreteHorizonKey"
 horizon_external_ssl: False