Merge "Move test-vars into overrides file"

tests/os_barbican-overrides.yml

@@ -13,6 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+barbican_galera_password: SuperSecrete
+barbican_developer_mode: true
+barbican_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
+barbican_galera_database: barbican
+barbican_keystone_auth: yes
+barbican_rabbitmq_password: secrete
+barbican_rabbitmq_userid: barbican
+barbican_rabbitmq_vhost: /barbican
+barbican_service_password: secrete
+barbican_venv_tag: testing
+
+barbican_service_publicurl: "http://{{ hostvars[groups['barbican_all'][0]]['ansible_host'] }}:9311"
+barbican_service_internalurl: "{{ barbican_service_publicurl }}"
+barbican_service_adminurl: "{{ barbican_service_publicurl }}"
+
 tempest_run: yes
 
 tempest_plugins:

tests/test-install-barbican.yml

@@ -42,4 +42,3 @@
     - role: "os_barbican"
   vars_files:
     - common/test-vars.yml
-    - test-vars.yml

tests/test-vars.yml

@@ -1,14 +0,0 @@
-barbican_galera_password: SuperSecrete
-barbican_developer_mode: true
-barbican_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
-barbican_galera_database: barbican
-barbican_keystone_auth: yes
-barbican_rabbitmq_password: secrete
-barbican_rabbitmq_userid: barbican
-barbican_rabbitmq_vhost: /barbican
-barbican_service_password: secrete
-barbican_venv_tag: testing
-
-barbican_service_publicurl: "http://{{ hostvars[groups['barbican_all'][0]]['ansible_host'] }}:9311"
-barbican_service_internalurl: "{{ barbican_service_publicurl }}"
-barbican_service_adminurl: "{{ barbican_service_publicurl }}"