|
3 | 3 | def get_defaults(_facts) |
4 | 4 | bip = :undef |
5 | 5 | bridge = :undef |
6 | | - compose_base_url = 'https://github.com/docker/compose/releases/download' |
7 | | - compose_symlink_name = 'docker-compose' |
8 | 6 | curl_ensure = true |
9 | 7 | default_gateway = :undef |
10 | 8 | default_gateway_ipv6 = :undef |
@@ -88,18 +86,15 @@ def get_defaults(_facts) |
88 | 86 | tmp_dir = '/tmp/' |
89 | 87 | tmp_dir_config = true |
90 | 88 | version = :undef |
| 89 | + compose_version = :undef |
91 | 90 |
|
92 | 91 | if _facts[:os]['family'] == 'windows' |
93 | | - compose_install_path = "#{_facts['docker_program_files_path']}/Docker" |
94 | | - compose_version = '1.21.2' |
95 | 92 | docker_ee_package_name = 'Docker' |
96 | 93 | machine_install_path = "#{_facts['docker_program_files_path']}/Docker" |
97 | 94 | tls_cacert = "#{_facts['docker_program_data_path']}/docker/certs.d/ca.pem" |
98 | 95 | tls_cert = "#{_facts['docker_program_data_path']}/docker/certs.d/server-cert.pem" |
99 | 96 | tls_key = "#{_facts['docker_program_data_path']}/docker/certs.d/server-key.pem" |
100 | 97 | else |
101 | | - compose_install_path = '/usr/local/bin' |
102 | | - compose_version = '1.9.0' |
103 | 98 | docker_ee_package_name = 'docker-ee' |
104 | 99 | machine_install_path = '/usr/local/bin' |
105 | 100 | tls_cacert = '/etc/docker/tls/ca.pem' |
@@ -340,9 +335,6 @@ def get_defaults(_facts) |
340 | 335 | 'apt_source_pin_level' => apt_source_pin_level, |
341 | 336 | 'bip' => bip, |
342 | 337 | 'bridge' => bridge, |
343 | | - 'compose_base_url' => compose_base_url, |
344 | | - 'compose_install_path' => compose_install_path, |
345 | | - 'compose_symlink_name' => compose_symlink_name, |
346 | 338 | 'compose_version' => compose_version, |
347 | 339 | 'curl_ensure' => curl_ensure, |
348 | 340 | 'default_gateway' => default_gateway, |
|
0 commit comments