diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 08:41:05 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 08:41:05 +0000 |
| commit | 3f49ba502cfdd7acecf91908c12646d25491ec60 (patch) | |
| tree | 34d9537ace3387d4f4de9a7bed1dbc64234013d6 | |
| parent | 7a63ab73c0db273121df61f1744388f8a13c273e (diff) | |
| download | definitions-3f49ba502cfdd7acecf91908c12646d25491ec60.tar.gz | |
fixup: Fix variable names in os.conf patch
| -rw-r--r-- | mason.configure | 2 | ||||
| -rw-r--r-- | mason/ansible/mason-setup.yml | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/mason.configure b/mason.configure index 0507fe10..d0abbf11 100644 --- a/mason.configure +++ b/mason.configure @@ -121,7 +121,7 @@ mason_configuration={ yaml.dump(mason_configuration, sys.stdout, default_flow_style=False) EOF -if [ "$TEST_INFRA" = "openstack" ]; then +if [ "$TEST_INFRASTRUCTURE_TYPE" = "openstack" ]; then python <<'EOF' >"$MASON_DATA/os.conf" import os, sys, yaml 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 |