Merge pull request #18 from jeduardo/master
Added support for installation on ARM architectures
This commit is contained in:
commit
6eb4a4356f
3 changed files with 22 additions and 6 deletions
|
@ -1,6 +1,5 @@
|
|||
consul:
|
||||
version: 0.7.0
|
||||
hash: b350591af10d7d23514ebaa0565638539900cdb3aaa048f077217c4c46653dd8
|
||||
download_host: releases.hashicorp.com
|
||||
|
||||
service: false
|
||||
|
|
|
@ -39,14 +39,14 @@ consul-data-dir:
|
|||
# Install agent
|
||||
consul-download:
|
||||
file.managed:
|
||||
- name: /tmp/consul_{{ consul.version }}_linux_amd64.zip
|
||||
- source: https://{{ consul.download_host }}/consul/{{ consul.version }}/consul_{{ consul.version }}_linux_amd64.zip
|
||||
- source_hash: sha256={{ consul.hash }}
|
||||
- name: /tmp/consul_{{ consul.version }}_linux_{{ consul.arch }}.zip
|
||||
- source: https://{{ consul.download_host }}/consul/{{ consul.version }}/consul_{{ consul.version }}_linux_{{ consul.arch }}.zip
|
||||
- source_hash: https://releases.hashicorp.com/consul/{{ consul.version }}/consul_{{ consul.version }}_SHA256SUMS
|
||||
- unless: test -f /usr/local/bin/consul-{{ consul.version }}
|
||||
|
||||
consul-extract:
|
||||
cmd.wait:
|
||||
- name: unzip /tmp/consul_{{ consul.version }}_linux_amd64.zip -d /tmp
|
||||
- name: unzip /tmp/consul_{{ consul.version }}_linux_{{ consul.arch }}.zip -d /tmp
|
||||
- watch:
|
||||
- file: consul-download
|
||||
|
||||
|
@ -61,7 +61,7 @@ consul-install:
|
|||
|
||||
consul-clean:
|
||||
file.absent:
|
||||
- name: /tmp/consul_{{ consul.version }}_linux_amd64.zip
|
||||
- name: /tmp/consul_{{ consul.version }}_linux_{{ consul.arch }}.zip
|
||||
- watch:
|
||||
- file: consul-install
|
||||
|
||||
|
|
|
@ -1,5 +1,22 @@
|
|||
{% import_yaml "consul/defaults.yaml" as defaults %}
|
||||
|
||||
{## Add any overrides based on CPU architecture. ##}
|
||||
{% set cpu_arch_map = salt['grains.filter_by']({
|
||||
'armv6l': {
|
||||
"arch": 'arm'
|
||||
},
|
||||
'armv7l': {
|
||||
"arch": 'arm'
|
||||
},
|
||||
'x86_64': {
|
||||
"arch": 'amd64'
|
||||
}
|
||||
}
|
||||
,grain="cpuarch"
|
||||
,merge=salt['pillar.get']('consul'))
|
||||
%}
|
||||
{% do defaults.consul.update(cpu_arch_map) %}
|
||||
|
||||
{% set consul = salt['pillar.get']('consul', default=defaults.consul, merge=True) %}
|
||||
|
||||
{% do consul.config.update({'retry_join': consul.config.retry_join or []}) %}
|
||||
|
|
Loading…
Reference in a new issue