Merge "Convert sandbox_enabled value to string"
diff --git a/barbican/client/v1/init.yml b/barbican/client/v1/init.yml
index c582343..352520d 100644
--- a/barbican/client/v1/init.yml
+++ b/barbican/client/v1/init.yml
@@ -1,5 +1,6 @@
-barbican:
- client:
- resources:
- v1:
- enabled: true
\ No newline at end of file
+parameters:
+ barbican:
+ client:
+ resources:
+ v1:
+ enabled: true
\ No newline at end of file
diff --git a/barbican/client/v1/signed_images/octavia.yml b/barbican/client/v1/signed_images/octavia.yml
index c348674..ae708cf 100644
--- a/barbican/client/v1/signed_images/octavia.yml
+++ b/barbican/client/v1/signed_images/octavia.yml
@@ -1,3 +1,6 @@
+classes:
+- system.barbican.client.v1.octavia
+
parameters:
_param:
octavia_image_cert_key: '/etc/octavia/certs/image.key'
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 755fbf8..554c8ec 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -14,6 +14,7 @@
gainsight_config_directory: '/srv/gainsight'
gainsight_crontab_directory: '/etc/cron.d'
gainsight_config_path: "${_param:gainsight_config_directory}/config.ini"
+ gainsight_csv_retention: 180
docker:
client:
stack:
@@ -39,6 +40,7 @@
volumes:
- ${prometheus:gainsight:dir:config}:${_param:gainsight_config_directory}
- ${prometheus:gainsight:dir:crontab}:${_param:gainsight_crontab_directory}
+ - ${prometheus:gainsight:dir:csv}:/opt/gainsight/csv
environment:
CSV_UPLOAD_URL: "${_param:gainsight_csv_upload_url}"
ACCOUNT_ID: "${_param:gainsight_account_id}"
@@ -50,3 +52,4 @@
PROMETHEUS_URL: "${_param:gainsight_prometheus_url}"
CONFIG_PATH: "${_param:gainsight_config_path}"
ENABLED: "${_param:gainsight_enabled}"
+ RETENTION: ${_param:gainsight_csv_retention}
diff --git a/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml b/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
index f960fdc..d8649ed 100644
--- a/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
+++ b/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
@@ -14,6 +14,7 @@
gainsight_elasticsearch_config_directory: '/srv/gainsight'
gainsight_elasticsearch_crontab_directory: '/etc/cron.d'
gainsight_elasticsearch_config_path: "${_param:gainsight_elasticsearch_config_directory}/config.ini"
+ gainsight_elasticsearch_csv_retention: 180
docker:
client:
stack:
@@ -39,6 +40,7 @@
volumes:
- ${prometheus:gainsight_elasticsearch:dir:config}:${_param:gainsight_elasticsearch_config_directory}
- ${prometheus:gainsight_elasticsearch:dir:crontab}:${_param:gainsight_elasticsearch_crontab_directory}
+ - ${prometheus:gainsight_elasticsearch:dir:csv}:/opt/gainsight/csv
environment:
CSV_UPLOAD_URL: "${_param:gainsight_elasticsearch_csv_upload_url}"
ACCOUNT_ID: "${_param:gainsight_elasticsearch_account_id}"
@@ -50,3 +52,4 @@
ELASTICSEARCH_HOST: "${_param:gainsight_elasticsearch_elasticsearch_vip}"
CONFIG_PATH: "${_param:gainsight_elasticsearch_config_path}"
ENABLED: "${_param:gainsight_elasticsearch_enabled}"
+ RETENTION: ${_param:gainsight_elasticsearch_csv_retention}
diff --git a/opencontrail/control/analytics.yml b/opencontrail/control/analytics.yml
index 7471997..d6cff61 100644
--- a/opencontrail/control/analytics.yml
+++ b/opencontrail/control/analytics.yml
@@ -6,7 +6,7 @@
parameters:
_param:
opencontrail_kafka_log_cleanup_mtime: '+7'
- opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+ opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -22,7 +22,7 @@
- nf_conntrack_ipv4
job:
kafka_logs_cleanup:
- command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+ command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
identifier: kafka_logs_cleanup
hour: 0
minute: 0
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index f0cf352..ed6fb15 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -6,8 +6,9 @@
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
+ opencontrail_kafka_config_dir: '/usr/share/kafka/config'
opencontrail_kafka_log_cleanup_mtime: '+7'
- opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+ opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
opencontrail_image_tag: latest
@@ -27,7 +28,7 @@
- nf_conntrack_ipv4
job:
kafka_logs_cleanup:
- command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+ command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
identifier: kafka_logs_cleanup
hour: 0
minute: 0
@@ -101,10 +102,10 @@
- /var/lib/analyticsdb:/var/lib/cassandra
- /var/lib/analyticsdb_zookeeper_data:/var/lib/zookeeper
- /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
- - /usr/share/kafka/config/server.properties:/usr/share/kafka/config/server.properties
- - /usr/share/kafka/config/consumer.properties:/usr/share/kafka/config/consumer.properties
- - /usr/share/kafka/config/zookeeper.properties:/usr/share/kafka/config/zookeeper.properties
- - /usr/share/kafka/logs:/usr/share/kafka/logs
+ - ${_param:opencontrail_kafka_config_dir}/server.properties:${_param:opencontrail_kafka_config_dir}/server.properties
+ - ${_param:opencontrail_kafka_config_dir}/consumer.properties:${_param:opencontrail_kafka_config_dir}/consumer.properties
+ - ${_param:opencontrail_kafka_config_dir}/zookeeper.properties:${_param:opencontrail_kafka_config_dir}/zookeeper.properties
+ - ${_param:opencontrail_kafka_log_dir}:${_param:opencontrail_kafka_log_dir}
- /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
- /var/log/contrail:/var/log/contrail
diff --git a/opencontrail/control/cluster.yml b/opencontrail/control/cluster.yml
index 28c12c4..33bfedc 100644
--- a/opencontrail/control/cluster.yml
+++ b/opencontrail/control/cluster.yml
@@ -7,7 +7,7 @@
parameters:
_param:
opencontrail_kafka_log_cleanup_mtime: '+7'
- opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+ opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -21,7 +21,7 @@
- nf_conntrack_ipv4
job:
kafka_logs_cleanup:
- command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+ command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
identifier: kafka_logs_cleanup
hour: 0
minute: 0
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 381a0d2..5914c50 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -6,8 +6,9 @@
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
+ opencontrail_kafka_config_dir: '/usr/share/kafka/config'
opencontrail_kafka_log_cleanup_mtime: '+7'
- opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+ opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
opencontrail_image_tag: latest
@@ -31,7 +32,7 @@
- nf_conntrack_ipv4
job:
kafka_logs_cleanup:
- command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+ command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
identifier: kafka_logs_cleanup
hour: 0
minute: 0
@@ -179,10 +180,10 @@
- /var/lib/analyticsdb:/var/lib/cassandra
- /var/lib/analyticsdb_zookeeper_data:/var/lib/zookeeper
- /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
- - /usr/share/kafka/config/server.properties:/usr/share/kafka/config/server.properties
- - /usr/share/kafka/config/consumer.properties:/usr/share/kafka/config/consumer.properties
- - /usr/share/kafka/config/zookeeper.properties:/usr/share/kafka/config/zookeeper.properties
- - /usr/share/kafka/logs:/usr/share/kafka/logs
+ - ${_param:opencontrail_kafka_config_dir}/server.properties:${_param:opencontrail_kafka_config_dir}/server.properties
+ - ${_param:opencontrail_kafka_config_dir}/consumer.properties:${_param:opencontrail_kafka_config_dir}/consumer.properties
+ - ${_param:opencontrail_kafka_config_dir}/zookeeper.properties:${_param:opencontrail_kafka_config_dir}/zookeeper.properties
+ - ${_param:opencontrail_kafka_log_dir}:${_param:opencontrail_kafka_log_dir}
- /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
- /var/log/contrail:/var/log/contrail
diff --git a/opencontrail/control/cluster4_0_k8s.yml b/opencontrail/control/cluster4_0_k8s.yml
index cb9ce4f..5564ccf 100644
--- a/opencontrail/control/cluster4_0_k8s.yml
+++ b/opencontrail/control/cluster4_0_k8s.yml
@@ -6,7 +6,7 @@
parameters:
_param:
opencontrail_kafka_log_cleanup_mtime: '+7'
- opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+ opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
opencontrail_image_tag: latest
@@ -30,7 +30,7 @@
- nf_conntrack_ipv4
job:
kafka_logs_cleanup:
- command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+ command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
identifier: kafka_logs_cleanup
hour: 0
minute: 0
diff --git a/opencontrail/control/single.yml b/opencontrail/control/single.yml
index 2ba745b..ef798bd 100644
--- a/opencontrail/control/single.yml
+++ b/opencontrail/control/single.yml
@@ -4,7 +4,7 @@
parameters:
_param:
opencontrail_kafka_log_cleanup_mtime: '+7'
- opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+ opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -20,7 +20,7 @@
- nf_conntrack_ipv4
job:
kafka_logs_cleanup:
- command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+ command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
identifier: kafka_logs_cleanup
hour: 0
minute: 0
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 779d8d0..9857221 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -4,8 +4,9 @@
- service.haproxy.proxy.single
parameters:
_param:
+ opencontrail_kafka_config_dir: '/usr/share/kafka/config'
opencontrail_kafka_log_cleanup_mtime: '+7'
- opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+ opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
opencontrail_image_tag: latest
@@ -26,7 +27,7 @@
- nf_conntrack_ipv4
job:
kafka_logs_cleanup:
- command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+ command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
identifier: kafka_logs_cleanup
hour: 0
minute: 0
@@ -198,10 +199,10 @@
- /var/lib/analyticsdb:/var/lib/cassandra
- /var/lib/analyticsdb_zookeeper_data:/var/lib/zookeeper
- /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
- - /usr/share/kafka/config/server.properties:/usr/share/kafka/config/server.properties
- - /usr/share/kafka/config/consumer.properties:/usr/share/kafka/config/consumer.properties
- - /usr/share/kafka/config/zookeeper.properties:/usr/share/kafka/config/zookeeper.properties
- - /usr/share/kafka/logs:/usr/share/kafka/logs
+ - ${_param:opencontrail_kafka_config_dir}/server.properties:${_param:opencontrail_kafka_config_dir}/server.properties
+ - ${_param:opencontrail_kafka_config_dir}/consumer.properties:${_param:opencontrail_kafka_config_dir}/consumer.properties
+ - ${_param:opencontrail_kafka_config_dir}/zookeeper.properties:${_param:opencontrail_kafka_config_dir}/zookeeper.properties
+ - ${_param:opencontrail_kafka_log_dir}:${_param:opencontrail_kafka_log_dir}
- /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
- /var/log/contrail:/var/log/contrail
diff --git a/salt/minion/cert/octavia/image_sign.yml b/salt/minion/cert/octavia/image_sign.yml
index 2e67a02..ad7cfd0 100644
--- a/salt/minion/cert/octavia/image_sign.yml
+++ b/salt/minion/cert/octavia/image_sign.yml
@@ -1,17 +1,15 @@
-classes:
-- system.salt.minion.cert.octavia
parameters:
_param:
+ salt_minion_ca_authority: salt_master_ca
octavia_image_cert_key: /etc/octavia/certs/image.key
octavia_image_cert_file: /etc/octavia/certs/image.crt
salt:
minion:
cert:
octavia:
- host: ${_param:octavia_ca_host}
- authority: octavia_ca
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
common_name: octavia
signing_policy: cert_server
- key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
key_file: ${_param:octavia_image_cert_key}
cert_file: ${_param:octavia_image_cert_file}
\ No newline at end of file