Merge "Define apt_mk_version as contrail container tag version for k8s"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index e6dd320..1c864e5 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -33,9 +33,15 @@
# Barbican
barbican_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
barbican_memcache_secret_key: ''
+ # 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'
+ # Horizon
+ # 'direct' mode will require cors on glance side to be enabled.
+ horizon_images_upload_mode: 'legacy'
diff --git a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
index d642dd2..8380377 100644
--- a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
+++ b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
@@ -36,7 +36,7 @@
xpack.monitoring.enabled: "false"
bootstrap.memory_lock: "false"
discovery.zen.minimum_master_nodes: 2
- discovery.zen.ping.unicast.hosts: ${_param:stacklight_monitor_address}
+ discovery.zen.ping.unicast.hosts: ${_param:stacklight_log_address}
labels:
com.mirantis.monitoring: "elasticsearch"
image: ${_param:docker_image_elasticsearch}
diff --git a/horizon/server/cluster.yml b/horizon/server/cluster.yml
index 1d1f5eb..0cd20d7 100644
--- a/horizon/server/cluster.yml
+++ b/horizon/server/cluster.yml
@@ -16,6 +16,7 @@
plugin: {}
session:
engine: "cache"
+ images_upload_mode: ${_param:horizon_images_upload_mode}
apache:
server:
modules:
diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index 2555a50..bd2ea7b 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -14,6 +14,7 @@
plugin: {}
session:
engine: "cache"
+ images_upload_mode: ${_param:horizon_images_upload_mode}
apache:
server:
modules:
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index fe90091..5bbf8ce 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -33,3 +33,8 @@
cert_file: ${_param:rabbitmq_ironic_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ cache:
+ security:
+ enabled: ${_param:ironic_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:ironic_memcache_secret_key}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 1ca654b..cdd6b58 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -31,3 +31,8 @@
cert_file: ${_param:rabbitmq_ironic_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ cache:
+ security:
+ enabled: ${_param:ironic_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:ironic_memcache_secret_key}
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index a839f5d..7038095 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -29,3 +29,8 @@
cert_file: ${_param:rabbitmq_ironic_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ cache:
+ security:
+ enabled: ${_param:ironic_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:ironic_memcache_secret_key}
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index b08239e..f2855cc 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -30,3 +30,8 @@
cert_file: ${_param:rabbitmq_ironic_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ cache:
+ security:
+ enabled: ${_param:ironic_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:ironic_memcache_secret_key}
diff --git a/opencontrail/control/analytics.yml b/opencontrail/control/analytics.yml
index 36781c2..7471997 100644
--- a/opencontrail/control/analytics.yml
+++ b/opencontrail/control/analytics.yml
@@ -36,6 +36,8 @@
role: ${_param:opencontrail_node_role}
discovery:
host: ${_param:opencontrail_control_address}
+ identity:
+ host: ${_param:openstack_control_address}
database:
discovery:
host: ${_param:opencontrail_control_address}