Clean up placement test vars

Change-Id: I055c7da4080a5e7efc438aa4da04b35ad4d9f6d6
This commit is contained in:
Logan V 2019-05-10 17:52:50 -05:00
parent cc15c659c7
commit 65382d04e1

View File

@ -34,7 +34,6 @@ test_keystone_group: "{{ ((groups['keystone_all'] is defined) and (groups['keyst
test_glance_group: "{{ ((groups['glance_all'] is defined) and (groups['glance_all'] | length > 0)) | ternary('glance_all', 'all_containers') }}"
test_nova_api_metadata_group: "{{ ((groups['nova_api_metadata'] is defined) and (groups['nova_api_metadata'] | length > 0)) | ternary('nova_api_metadata', 'all_containers') }}"
test_nova_api_compute_group: "{{ ((groups['nova_api_os_compute'] is defined) and (groups['nova_api_os_compute'] | length > 0)) | ternary('nova_api_os_compute', 'all_containers') }}"
test_nova_api_placement_group: "{{ ((groups['nova_api_placement'] is defined) and (groups['nova_api_placement'] | length > 0)) | ternary('nova_api_placement', 'all_containers') }}"
test_nova_console_group: "{{ ((groups['nova_console'] is defined) and (groups['nova_console'] | length > 0)) | ternary('nova_console', 'all_containers') }}"
test_neutron_server_group: "{{ ((groups['neutron_server'] is defined) and (groups['neutron_server'] | length > 0)) | ternary('neutron_server', 'all_containers') }}"
test_swift_proxy_group: "{{ ((groups['swift_proxy'] is defined) and (groups['swift_proxy'] | length > 0)) | ternary('swift_proxy', 'all_containers') }}"
@ -48,7 +47,6 @@ test_keystone_host: "{{ hostvars[groups[test_keystone_group][0]]['ansible_host']
test_glance_host: "{{ hostvars[groups[test_glance_group][0]]['ansible_host'] }}"
test_nova_api_metadata_host: "{{ hostvars[groups[test_nova_api_metadata_group][0]]['ansible_host'] }}"
test_nova_api_compute_host: "{{ hostvars[groups[test_nova_api_compute_group][0]]['ansible_host'] }}"
test_nova_api_placement_host: "{{ hostvars[groups[test_nova_api_placement_group][0]]['ansible_host'] }}"
test_nova_console_host: "{{ hostvars[groups[test_nova_console_group][0]]['ansible_host'] }}"
test_neutron_server_host: "{{ hostvars[groups[test_neutron_server_group][0]]['ansible_host'] }}"
test_swift_proxy_host: "{{ hostvars[groups[test_swift_proxy_group][0]]['ansible_host'] }}"
@ -202,14 +200,6 @@ nova_venv_tag: "testing"
nova_discover_hosts_in_cells_interval: '-1'
# lxd specific vars
lxd_trust_password: "SuperSecrete"
# nova placement vars
nova_placement_service_password: "secrete"
nova_placement_service_publicuri: "http://{{ test_nova_api_placement_host }}:8780"
nova_placement_service_publicurl: "{{ nova_placement_service_publicuri }}"
nova_placement_service_adminuri: "http://{{ test_nova_api_placement_host }}:8780"
nova_placement_service_adminurl: "{{ nova_placement_service_adminuri }}"
nova_placement_service_internaluri: "http://{{ test_nova_api_placement_host }}:8780"
nova_placement_service_internalurl: "{{ nova_placement_service_internaluri }}"
nova_cell0_database: "nova_cell0"
# Neutron specific settings