diff --git a/config/goKMS/example01.yaml b/config/goKMS/example01.yaml index a80bf823e4d0b1aea97309db4453e54a9cbfa360..e3b918260c63e4d2ca1e26cd832acd65f577cf5e 100644 --- a/config/goKMS/example01.yaml +++ b/config/goKMS/example01.yaml @@ -2,7 +2,6 @@ Id: "0ff33c82-7fe1-482b-a0ca-67565806ee4b" Name: kms01 InterComAddr: 172.100.20.10:50910 QuantumAddr: 172.100.20.10:50911 -GRPCAddr: 172.100.20.10:50900 AkmsURL: "http://172.100.20.22:4444/api/v1/keys/push_ksa_key" AkmsCkmsServerPort: "9696" KmsTLS: diff --git a/config/goKMS/example02.yaml b/config/goKMS/example02.yaml index d6f01e59130be52317fb663c844d2ae1d2879ebc..d1d37160ad488a1a1239c179a223c62261de1f8a 100644 --- a/config/goKMS/example02.yaml +++ b/config/goKMS/example02.yaml @@ -2,7 +2,6 @@ Id: "5e41c291-6121-4335-84f6-41e04b8bdaa2" Name: kms02 InterComAddr: 172.100.20.11:50910 QuantumAddr: 172.100.20.11:50911 -GRPCAddr: 172.100.20.11:50900 KmsTLS: TLS: false CAFile: "ssl/ca.crt" diff --git a/config/goKMS/example03.yaml b/config/goKMS/example03.yaml index 23502a3e792b8595bd5d00ab3951c61e0171dd47..f1a31603c0f3f4fd5091adc19c36d84679de0113 100644 --- a/config/goKMS/example03.yaml +++ b/config/goKMS/example03.yaml @@ -2,7 +2,6 @@ Id: "f80db2c0-2480-46b9-b7d1-b63f954e8227" Name: kms03 InterComAddr: 172.100.20.12:50910 QuantumAddr: 172.100.20.12:50911 -GRPCAddr: 172.100.20.12:50900 KmsTLS: TLS: false CAFile: "ssl/ca.crt" diff --git a/config/goKMS/example04.yaml b/config/goKMS/example04.yaml index 3d7397414ce2bfc16d1ee8160459898d895dcefc..7e6b79b57ddf7db0f6ce1f24c8d7f0c78a8749a0 100644 --- a/config/goKMS/example04.yaml +++ b/config/goKMS/example04.yaml @@ -2,7 +2,6 @@ Id: "968fd594-b0e7-41f0-ba4b-de259047a933" Name: kms04 InterComAddr: 172.100.20.13:50910 QuantumAddr: 172.100.20.13:50911 -GRPCAddr: 172.100.20.13:50900 AkmsURL: "http://172.100.20.23:4444/api/v1/keys/push_ksa_key" AkmsCkmsServerPort: "9696" KmsTLS: diff --git a/config/goKMS/small_kms_1.yaml b/config/goKMS/small_kms_1.yaml index 538ad6f8085a6576e572d1e5a2be0b5fa6e5e222..d72c9c7ffed421a9f55acd3f7f8e46f205721303 100644 --- a/config/goKMS/small_kms_1.yaml +++ b/config/goKMS/small_kms_1.yaml @@ -1,7 +1,6 @@ Id: '0ff33c82-7fe1-482b-a0ca-67565806ee4b' Name: kms_1 InterComAddr: 0.0.0.0:50910 -GRPCAddr: 0.0.0.0:50900 QuantumAddr: 0.0.0.0:50911 AkmsURL: "http://akms-simulator_1:4444/api/v1/keys/push_ksa_key" AkmsCkmsServerPort: "9696" diff --git a/config/goKMS/small_kms_2.yaml b/config/goKMS/small_kms_2.yaml index e85e3563aa182269d4c21f54766a36396c2cb61f..98644c38291c13b775ae4f1d6c5032f582c5037a 100644 --- a/config/goKMS/small_kms_2.yaml +++ b/config/goKMS/small_kms_2.yaml @@ -2,7 +2,6 @@ Id: '5e41c291-6121-4335-84f6-41e04b8bdaa2' Name: kms_2 InterComAddr: 0.0.0.0:50910 GRPCAddr: 0.0.0.0:50900 -QuantumAddr: 0.0.0.0:50911 AkmsURL: "http://akms-simulator_2:4444/api/v1/keys/push_ksa_key" AkmsCkmsServerPort: "9696" Peers: diff --git a/goKMS/config/config.go b/goKMS/config/config.go index a9ae1d6a42466bbe17a9edfedcdc53c95e6bfd5f..c8baeca69f0be281a714549db0b230dc8baa8844 100644 --- a/goKMS/config/config.go +++ b/goKMS/config/config.go @@ -7,7 +7,6 @@ type Config struct { Name string `yaml:"Name"` InterComAddr string `yaml:"InterComAddr"` QuantumAddr string `yaml:"QuantumAddr"` - GRPCAddr string `yaml:"GRPCAddr"` AkmsURL string `yaml:"AkmsURL"` AkmsCkmsServerPort string `yaml:"AkmsCkmsServerPort"` GnmiBindAddress string `yaml:"GnmiBindAddress"` diff --git a/integration-tests/config/kms/kms_1.yaml b/integration-tests/config/kms/kms_1.yaml index e9a119b8d6b3a357908180dc46e06536d2fb5993..489cf28a85d625f36cf9c419bee52a6787683ba9 100644 --- a/integration-tests/config/kms/kms_1.yaml +++ b/integration-tests/config/kms/kms_1.yaml @@ -2,7 +2,6 @@ Id: '0ff33c82-7fe1-482b-a0ca-67565806ee4b' Name: kms_1 InterComAddr: 0.0.0.0:50910 QuantumAddr: 0.0.0.0:50911 -GRPCAddr: 0.0.0.0:50900 AkmsURL: "http://akms-simulator_1:4444/api/v1/keys/push_ksa_key" AkmsCkmsServerPort: "9696" KmsTLS: diff --git a/integration-tests/config/kms/kms_2.yaml b/integration-tests/config/kms/kms_2.yaml index 595ca285c5c4b329869ab99e2feee4a1334ab9db..87bbde3231dc913c1201ef9fcdbafb4c6d50b026 100644 --- a/integration-tests/config/kms/kms_2.yaml +++ b/integration-tests/config/kms/kms_2.yaml @@ -2,7 +2,6 @@ Id: '5e41c291-6121-4335-84f6-41e04b8bdaa2' Name: kms_2 InterComAddr: 0.0.0.0:50910 QuantumAddr: 0.0.0.0:50911 -GRPCAddr: 0.0.0.0:50900 AkmsURL: "http://akms-simulator_2:4444/api/v1/keys/push_ksa_key" AkmsCkmsServerPort: "9696" KmsTLS: