commit e1e20dccc7b79b0dd15be907920de31df84be91c
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Nov 02 17:23:45 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Nov 02 17:23:45 2018 +0000
tree 72b7ded9ad297585576023b977a661d62248c946
parent b725fefe2578a9acaf9b0f60e62633a0b94f5ddf
parent ceef60d8c90bd3d7e2ba5158876568e93bf5cc2e

Merge "Adding keystone os_client_config to keystone nodes"

keystone/server/cluster.yml

diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index f83b039..02e747d 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -7,10 +7,12 @@
 - system.keystone.server.fernet_rotation.cluster
 - system.salt.minion.cert.mysql.clients.openstack.keystone
 - system.salt.minion.cert.rabbitmq.clients.openstack.keystone
+- system.keystone.client.os_client_config.admin_identity
 parameters:
   _param:
     keystone_tokens_expiration: 3600
     openstack_node_role: primary
+    keystone_service_protocol: ${_param:cluster_internal_protocol}
   linux:
     system:
       package:

keystone/server/single.yml

diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index cbfeb40..a57d99a 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -4,6 +4,7 @@
 - system.keystone.server.fernet_rotation.single
 - system.salt.minion.cert.mysql.clients.openstack.keystone
 - system.salt.minion.cert.rabbitmq.clients.openstack.keystone
+- system.keystone.client.os_client_config.admin_identity
 parameters:
   _param:
     keystone_service_token: token
@@ -13,6 +14,7 @@
     mysql_keystone_password: password
     keystone_tokens_expiration: 3600
     openstack_node_role: primary
+    keystone_service_protocol: ${_param:cluster_internal_protocol}
   linux:
     system:
       package: