openstack/openstack-ansible-tests
Code Issues Proposed changes

Allow storage and repl networks to be dynamic

Browse Source 
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
This commit is contained in:
Andy McCrae 2016-09-23 10:06:31 +01:00
parent 29f507927e
commit 96cfd2d1ff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test-vars.yml
View File

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