From 96cfd2d1ff4ae84293e7c296cf9df3cee736e24f Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 23 Sep 2016 10:06:31 +0100 Subject: [PATCH] Allow storage and repl networks to be dynamic For additional gates that may require swift (e.g. ironic), we can't guarantee the networks that will be used for storage/replication - this PR sets them as variables so that they can be overridden if required. Additional fix to fix a regression that was fixed in the swift repository before central tests were implemented. Change-Id: Ia983acb3840358c9d0035ee3d69d6b4c4e4bfcf7 --- test-vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-vars.yml b/test-vars.yml index 1b57cf2f..853aa64c 100644 --- a/test-vars.yml +++ b/test-vars.yml @@ -189,7 +189,6 @@ cinder_backends_rbd_inuse: false cinder_ceph_client: cinder # Swift specific settings -swift_storage_address: "{{ ansible_host }}" swift_container_mysql_password: "SuperSecrete" swift_dispersion_password: "secrete" swift_hash_path_prefix: "secrete_prefx" @@ -203,9 +202,10 @@ swift_service_publicuri: "http://{{ hostvars[groups['swift_proxy'][0]]['ansible_ swift_service_adminuri: "http://{{ hostvars[groups['swift_proxy'][0]]['ansible_host'] }}:8080" swift_service_internaluri: "http://{{ hostvars[groups['swift_proxy'][0]]['ansible_host'] }}:8080" swift_replication_address: "{{ replication_address }}" +swift_storage_address: "{{ storage_address }}" swift: - storage_network: eth1 - repl_network: eth3 + storage_network: "{{ test_swift_storage_network | default('eth2') }}" + replication_network: "{{ test_swift_repl_network | default('eth3') }}" part_power: 8 region: "{{ test_swift_region | default(1) }}" drives: