commit 3f736c4f430b54953dfde31b814bf6b996c9b6ab
author azvyagintsev <azvyagintsev@mirantis.com> Thu Nov 01 20:04:29 2018 +0200
committer Aleksey Zvyagintsev <azvyagintsev@mirantis.com> Mon Nov 12 18:41:43 2018 +0000
tree 6c26d69f47bf5265c478ee8833c85e8cfcb9e1f2
parent 8fcbe75dcb383b47545abf6cc4d7108e0c59de7b

Move cluster_public|internal_protocol to defaults

Closes-bug: PROD-24615 (PROD:24615)

Change-Id: I5083de941a2db42e5b46a6bdc6eacce07b4da266

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index eedc587..8029768 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -1,14 +1,19 @@
 parameters:
   _param:
+    # General
+    cluster_public_protocol: https
+    cluster_internal_protocol: http
     # SSL
     ceilometer_agent_ssl_enabled: False
     openstack_mysql_x509_enabled: False
     # for non-ssl use 5672 / for ssl 5671
     openstack_rabbitmq_port: 5672
     openstack_rabbitmq_x509_enabled: False
-    # Openstack memcache security
+    # Openstack memcache
     openstack_memcache_security_enabled: False
     openstack_memcache_security_strategy: 'ENCRYPT'
+    openstack_memcached_proto_tcp_enabled: True
+    openstack_memcached_proto_udp_enabled: False
     # Cinder
     cinder_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     cinder_memcache_secret_key: ''
@@ -38,9 +43,6 @@
     # Ironic
     ironic_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     ironic_memcache_secret_key: ''
-    # Openstack memcached server protocols
-    openstack_memcached_proto_tcp_enabled: True
-    openstack_memcached_proto_udp_enabled: False
     # Apache mods defaults
     apache_mods_status_enabled: True
     apache_mods_status_status: 'disabled'