summaryrefslogtreecommitdiff
path: root/mason/ansible/mason-setup.yml
diff options
context:
space:
mode:
Diffstat (limited to 'mason/ansible/mason-setup.yml')
-rw-r--r--mason/ansible/mason-setup.yml22
1 files changed, 11 insertions, 11 deletions
diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml
index 6375a19e..08490e78 100644
--- a/mason/ansible/mason-setup.yml
+++ b/mason/ansible/mason-setup.yml
@@ -36,20 +36,20 @@
- fail: msg='OPENSTACK_NETWORK_ID is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack'
when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OPENSTACK_NETWORK_ID is not defined
- - fail: msg='OS_USERNAME is mandatory when TEST_INFRA=openstack'
- when: TEST_INFRA == "openstack" and OS_USERNAME is not defined
+ - fail: msg='OS_USERNAME is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack'
+ when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_USERNAME is not defined
- - fail: msg='OS_PASSWORD is mandatory when TEST_INFRA=openstack'
- when: TEST_INFRA == "openstack" and OS_PASSWORD is not defined
+ - fail: msg='OS_PASSWORD is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack'
+ when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_PASSWORD is not defined
- - fail: msg='OS_TENANT_ID is mandatory when TEST_INFRA=openstack'
- when: TEST_INFRA == "openstack" and OS_TENANT_ID is not defined
+ - fail: msg='OS_TENANT_ID is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack'
+ when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_TENANT_ID is not defined
- - fail: msg='OS_TENANT_NAME is mandatory when TEST_INFRA=openstack'
- when: TEST_INFRA == "openstack" and OS_TENANT_NAME is not defined
+ - fail: msg='OS_TENANT_NAME is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack'
+ when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_TENANT_NAME is not defined
- - fail: msg='OS_AUTH_URL is mandatory when TEST_INFRA=openstack'
- when: TEST_INFRA == "openstack" and OS_AUTH_URL is not defined
+ - fail: msg='OS_AUTH_URL is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack'
+ when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_AUTH_URL is not defined
- name: Create the Mason configuration file
template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }}
@@ -60,7 +60,7 @@
template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }}
with_items:
- os.conf
- when: TEST_INFRA == "openstack"
+ when: TEST_INFRASTRUCTURE_TYPE == "openstack"
- name: Enable the mason service
service: name=mason.service enabled=yes