| Revision | 1973f1f46d808dada5917b953dc5ccfeef784ba1 (tree) |
|---|---|
| Time | 2017-02-19 21:23:05 |
| Author | whitestar <whitestar@gaea...> |
| Commiter | whitestar |
adds the ssl_cert cookbook dependency.
cookbooks/lxcs/Berksfile (diff) cookbooks/lxcs/CHANGELOG.md (diff) cookbooks/lxcs/metadata.rb (diff) cookbooks/lxcs/recipes/lxd.rb (diff)| @@ -0,0 +1,21 @@ | ||
| 1 | +# | |
| 2 | +# Copyright 2017 whitestar | |
| 3 | +# | |
| 4 | +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| 5 | +# you may not use this file except in compliance with the License. | |
| 6 | +# You may obtain a copy of the License at | |
| 7 | +# | |
| 8 | +# http://www.apache.org/licenses/LICENSE-2.0 | |
| 9 | +# | |
| 10 | +# Unless required by applicable law or agreed to in writing, software | |
| 11 | +# distributed under the License is distributed on an "AS IS" BASIS, | |
| 12 | +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| 13 | +# See the License for the specific language governing permissions and | |
| 14 | +# limitations under the License. | |
| 15 | +# | |
| 16 | + | |
| 17 | +# for ver. 3.x | |
| 18 | +#source 'https://gpm00.grid.example.com:6280' | |
| 19 | +source 'https://supermarket.chef.io' | |
| 20 | + | |
| 21 | +metadata |
| @@ -1,5 +1,9 @@ | ||
| 1 | 1 | # lxcs CHANGELOG |
| 2 | 2 | |
| 3 | +0.1.6 | |
| 4 | +----- | |
| 5 | +- adds the `ssl_cert` cookbook dependency. | |
| 6 | + | |
| 3 | 7 | 0.1.5 |
| 4 | 8 | ----- |
| 5 | 9 | - bug fix: LXD profile and network management. |
| @@ -5,7 +5,7 @@ maintainer_email '' | ||
| 5 | 5 | license 'Apache 2.0' |
| 6 | 6 | description 'Installs/Configures LinuxContainers.org products' |
| 7 | 7 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) |
| 8 | -version '0.1.5' | |
| 8 | +version '0.1.6' | |
| 9 | 9 | source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git' |
| 10 | 10 | issues_url 'https://osdn.jp/projects/metasearch/ticket' |
| 11 | 11 |
| @@ -15,3 +15,4 @@ issues_url 'https://osdn.jp/projects/metasearch/ticket' | ||
| 15 | 15 | supports 'ubuntu', '>= 16.04' |
| 16 | 16 | |
| 17 | 17 | depends 'platform_utils', '>= 0.3.1' |
| 18 | +depends 'ssl_cert', '>= 0.3.7' |
| @@ -17,6 +17,8 @@ | ||
| 17 | 17 | # limitations under the License. |
| 18 | 18 | # |
| 19 | 19 | |
| 20 | +::Chef::Recipe.send(:include, SSLCert::Helper) | |
| 21 | + | |
| 20 | 22 | lxd_conf = node['lxcs']['lxd'] |
| 21 | 23 | |
| 22 | 24 | # Note: LXD itself does not require this directory. |
| @@ -56,17 +58,7 @@ if lxd_conf['init']['enabled'] | ||
| 56 | 58 | item_conf = lxd_conf['init']['trust_password_vault_item'] |
| 57 | 59 | |
| 58 | 60 | unless item_conf.empty? |
| 59 | - require 'chef-vault' | |
| 60 | - secret = ChefVault::Item.load(item_conf['vault'], item_conf['name']) | |
| 61 | - if item_conf.key?('env_context') && item_conf['env_context'] == true | |
| 62 | - secret = secret[node.chef_environment] | |
| 63 | - end | |
| 64 | - if !item_conf['key'].nil? && !item_conf['key'].empty? | |
| 65 | - item_conf['key'].split('/').each {|elm| | |
| 66 | - secret = secret[elm] | |
| 67 | - } | |
| 68 | - end | |
| 69 | - | |
| 61 | + secret = get_vault_item_value(item_conf) | |
| 70 | 62 | opts += " --trust-password #{secret}" |
| 71 | 63 | end |
| 72 | 64 |
Fork