kaname 0.8.2 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +7 -16
- data/lib/kaname/adapter/read_and_write.rb +1 -1
- data/lib/kaname/cli.rb +2 -1
- data/lib/kaname/config.rb +12 -41
- data/lib/kaname/version.rb +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 12a0e64803312f26a75142e7149aaa0842da976002a4e5283d228954efb92ce0
|
4
|
+
data.tar.gz: bf43563c58a86f6e0d9eeed5dc03c2ef31230f2dba8eed3e9f6c42d2f58e6fd8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f5babea09ab0917e1207e7ec50f28c59700997f8a0d102c87d71e97feb56b89676826819037a4a3e62a2fb7d01eeadab900adc9e34a3441d95effc553be20453
|
7
|
+
data.tar.gz: fa1b59301c571ed3f57479fa406e33db14e48102ed9631ffc01e97db43b6b2a2023627471d7543e45f88d22dbfde12797866e93d4a8db4602fcf0adf8b6b302c
|
data/README.md
CHANGED
@@ -26,7 +26,7 @@ hsbt:
|
|
26
26
|
production: "member"
|
27
27
|
```
|
28
28
|
|
29
|
-
You can also define `all_tenants` for config all tenants' authority.
|
29
|
+
You can also define `all_tenants` for config all tenants' authority.
|
30
30
|
If both tenants and all_tenants are setting, tenants is preferred.
|
31
31
|
|
32
32
|
```yaml
|
@@ -35,23 +35,14 @@ suzupy:
|
|
35
35
|
all_tenants: member
|
36
36
|
```
|
37
37
|
|
38
|
-
You need to
|
38
|
+
You will need to set some ENV.
|
39
39
|
|
40
40
|
```sh
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
```
|
47
|
-
|
48
|
-
also, you can set some options.
|
49
|
-
|
50
|
-
```
|
51
|
-
ca_cert: "/path/to/ca.pem"
|
52
|
-
client_cert: "/path/to/cert.pem"
|
53
|
-
client_key: "/path/to/key.pem"
|
54
|
-
region_name: "YourRegion"
|
41
|
+
$ export OS_AUTH_URL="http://your-openstack-auth-endpoint/v3"
|
42
|
+
$ export OS_USERNAME="admin"
|
43
|
+
$ export OS_PASSWORD="admin"
|
44
|
+
$ export OS_PROJECT_NAME=admin
|
45
|
+
$ export OS_TENANT_NAME=admin
|
55
46
|
```
|
56
47
|
|
57
48
|
run following command.
|
@@ -28,7 +28,7 @@ module Kaname
|
|
28
28
|
end
|
29
29
|
|
30
30
|
if res.status == 200
|
31
|
-
puts "Your password is updated. Please update your
|
31
|
+
puts "Your password is updated. Please update your $OS_PASSWORD configuration too."
|
32
32
|
else
|
33
33
|
raise "password updating is failed"
|
34
34
|
end
|
data/lib/kaname/cli.rb
CHANGED
@@ -20,6 +20,7 @@ module Kaname
|
|
20
20
|
end
|
21
21
|
|
22
22
|
option :dryrun, type: :boolean
|
23
|
+
option :filename, aliases: :f, type: :string, default: 'keystone.yml'
|
23
24
|
desc 'apply', 'Commands about configuration apply'
|
24
25
|
def apply
|
25
26
|
adapter = if options[:dryrun]
|
@@ -28,7 +29,7 @@ module Kaname
|
|
28
29
|
Kaname::Adapter::ReadAndWrite.new
|
29
30
|
end
|
30
31
|
|
31
|
-
if Kaname::Resource.yaml
|
32
|
+
if Kaname::Resource.yaml(options[:filename])
|
32
33
|
diffs = Hashdiff.diff(adapter.users_hash, Kaname::Resource.yaml)
|
33
34
|
diffs.each do |diff|
|
34
35
|
resource = diff[1].split('.')
|
data/lib/kaname/config.rb
CHANGED
@@ -9,7 +9,6 @@ module Kaname
|
|
9
9
|
@@client_cert = nil
|
10
10
|
|
11
11
|
def self.setup
|
12
|
-
load_config unless envs_exist?
|
13
12
|
setup_yao
|
14
13
|
end
|
15
14
|
|
@@ -19,48 +18,20 @@ module Kaname
|
|
19
18
|
|
20
19
|
private
|
21
20
|
|
22
|
-
def self.envs_exist?
|
23
|
-
%w[OS_AUTH_URL OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_CERT OS_KEY OS_REGION_NAME OS_IDENTITY_API_VERSION].any?{|k|ENV[k]}
|
24
|
-
end
|
25
|
-
|
26
|
-
def self.load_config
|
27
|
-
config_file = File.join(Dir.home, '.kaname')
|
28
|
-
raise '~/.kaname is missing' unless File.exists?(config_file)
|
29
|
-
|
30
|
-
config = YAML.load_file(config_file)
|
31
|
-
|
32
|
-
%w[auth_url tenant username password].each do |conf_item|
|
33
|
-
raise "Configuration '#{conf_item}' is missing. Check your ~/.kaname" unless config[conf_item]
|
34
|
-
end
|
35
|
-
|
36
|
-
@@auth_url = config['auth_url']
|
37
|
-
@@tenant = config['tenant']
|
38
|
-
@@username = config['username']
|
39
|
-
@@password = config['password']
|
40
|
-
@@ca_cert = config['ca_cert']
|
41
|
-
@@client_cert = config['client_cert']
|
42
|
-
@@client_key = config['client_key']
|
43
|
-
@@region_name = config['region_name']
|
44
|
-
@@user_domain_name = config['user_domain_name']
|
45
|
-
@@project_domain_name = config['project_domain_name']
|
46
|
-
@@identity_api_version = config['identity_api_version']
|
47
|
-
true
|
48
|
-
end
|
49
|
-
|
50
21
|
def self.setup_yao
|
51
22
|
Yao.configure do
|
52
|
-
auth_url
|
53
|
-
tenant_name
|
54
|
-
username
|
55
|
-
password
|
56
|
-
ca_cert
|
57
|
-
client_cert
|
58
|
-
client_key
|
59
|
-
region_name
|
60
|
-
identity_api_version
|
61
|
-
user_domain_name
|
62
|
-
project_domain_name
|
63
|
-
debug
|
23
|
+
auth_url ENV['OS_AUTH_URL']
|
24
|
+
tenant_name ENV['OS_TENANT_NAME']
|
25
|
+
username ENV['OS_USERNAME']
|
26
|
+
password ENV['OS_PASSWORD']
|
27
|
+
ca_cert ENV['OS_CACERT']
|
28
|
+
client_cert ENV['OS_CERT']
|
29
|
+
client_key ENV['OS_KEY']
|
30
|
+
region_name ENV['OS_REGION_NAME']
|
31
|
+
identity_api_version ENV['OS_IDENTITY_API_VERSION']
|
32
|
+
user_domain_name ENV['OS_USER_DOMAIN_NAME']
|
33
|
+
project_domain_name ENV['OS_PROJECT_DOMAIN_NAME']
|
34
|
+
debug ENV['YAO_DEBUG']
|
64
35
|
end
|
65
36
|
end
|
66
37
|
end
|
data/lib/kaname/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kaname
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.9.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- SHIBATA Hiroshi
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-12-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: yao
|
@@ -182,7 +182,7 @@ homepage: https://github.com/yaocloud/kaname
|
|
182
182
|
licenses:
|
183
183
|
- MIT
|
184
184
|
metadata: {}
|
185
|
-
post_install_message:
|
185
|
+
post_install_message:
|
186
186
|
rdoc_options: []
|
187
187
|
require_paths:
|
188
188
|
- lib
|
@@ -197,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
197
197
|
- !ruby/object:Gem::Version
|
198
198
|
version: '0'
|
199
199
|
requirements: []
|
200
|
-
rubygems_version: 3.
|
201
|
-
signing_key:
|
200
|
+
rubygems_version: 3.2.32
|
201
|
+
signing_key:
|
202
202
|
specification_version: 4
|
203
203
|
summary: Identity configuration tool for OpenStack.
|
204
204
|
test_files: []
|