diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-19 17:48:04 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 13:44:28 +0000 |
| commit | 13a53409a0f4ea5a80c6f829dbd0cb227f0a0007 (patch) | |
| tree | f12a17561ad7d4455b9e45d8cef05940b920e1ca | |
| parent | 5cbda921714c39075abb2eb37386f46100ef0b07 (diff) | |
| download | infrastructure-13a53409a0f4ea5a80c6f829dbd0cb227f0a0007.tar.gz | |
fixup! mason: Make some configuration parameters optional in mason.conf
| -rw-r--r-- | mason/ansible/mason-setup.yml | 7 | ||||
| -rw-r--r-- | mason/turbo-hipster.service | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml index b67e8daf..f69d8a3d 100644 --- a/mason/ansible/mason-setup.yml +++ b/mason/ansible/mason-setup.yml @@ -83,6 +83,13 @@ # MASON_UPSTREAM_TROVE can also be set. If defined, built artifacts will be # uploaded to that Trove. + # Internal-only variable, used as a way of ensuring the OpenStack + # configuration is loaded when the 'turbo-hipster' job executor is started. + + - set_fact: TURBO_HIPSTER_COMMAND='/usr/bin/turbo-hipster -c /etc/turbo-hipster-config.yaml' + - set_fact: TURBO_HIPSTER_COMMAND='/bin/sh -c ". /etc/os.conf && {{TURBO_HIPSTER_COMMAND}" + when: MASON_TEST_INFRASTRUCTURE_TYPE == "openstack" + - name: Create required configuration files template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} with_items: diff --git a/mason/turbo-hipster.service b/mason/turbo-hipster.service index 20cde2ad..e2e2ff98 100644 --- a/mason/turbo-hipster.service +++ b/mason/turbo-hipster.service @@ -4,7 +4,7 @@ After=zuul-server.service [Service] User=root -ExecStart=/bin/sh -c ". /etc/os.conf && /usr/bin/turbo-hipster -c /etc/turbo-hipster-config.yaml" +ExecStart={{ TURBO_HIPSTER_COMMAND_PREFIX | default() }} /usr/bin/turbo-hipster -c /etc/turbo-hipster-config.yaml" [Install] WantedBy=multi-user.target |