Merge "Add prometheus-es-exporter" into release/2019.2.0
diff --git a/cinder/control/backup/ceph.yml b/cinder/control/backup/ceph.yml
new file mode 100644
index 0000000..5b9c5a7
--- /dev/null
+++ b/cinder/control/backup/ceph.yml
@@ -0,0 +1,10 @@
+parameters:
+ cinder:
+ controller:
+ backup:
+ engine: ceph
+ ceph_pool: ${_param:cinder_ceph_backup_pool}
+ ceph_stripe_count: ${_param:cinder_ceph_stripe_count}
+ ceph_stripe_unit: ${_param:cinder_ceph_stripe_unit}
+ ceph_user: ${_param:cinder_ceph_backup_user}
+ ceph_chunk_size: ${_param:cinder_ceph_chunk_size}
diff --git a/cinder/volume/backup/ceph.yml b/cinder/volume/backup/ceph.yml
new file mode 100644
index 0000000..5cc6e02
--- /dev/null
+++ b/cinder/volume/backup/ceph.yml
@@ -0,0 +1,10 @@
+parameters:
+ cinder:
+ volume:
+ backup:
+ engine: ceph
+ ceph_pool: ${_param:cinder_ceph_backup_pool}
+ ceph_stripe_count: ${_param:cinder_ceph_stripe_count}
+ ceph_stripe_unit: ${_param:cinder_ceph_stripe_unit}
+ ceph_user: ${_param:cinder_ceph_backup_user}
+ ceph_chunk_size: ${_param:cinder_ceph_chunk_size}
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 35c44a9..6adab6b 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -29,7 +29,7 @@
docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:${_param:mcp_version}"
docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/mirantis/external/braedon/prometheus-es-exporter:0.5.1"
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:${_param:mcp_version}"
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:${_param:mcp_version}"
+ docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:2019.2.3"
docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:${_param:mcp_version}"
docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus_relay:${_param:mcp_version}"
docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:${_param:mcp_version}"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 6623b29..5adb1a7 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -6,7 +6,13 @@
cluster_public_protocol: https
cluster_internal_protocol: http
openstack_service_hostname: os-ctl-vip
+ openstack_share_service_hostname: os-share-vip
+ openstack_kmn_service_hostname: os-kmn-vip
+ openstack_telemetry_service_hostname: os-telemetry-vip
openstack_service_host: ${_param:openstack_service_hostname}.${linux:system:domain}
+ openstack_share_service_host: ${_param:openstack_share_service_hostname}.${linux:system:domain}
+ openstack_kmn_service_host: ${_param:openstack_kmn_service_hostname}.${linux:system:domain}
+ openstack_telemetry_service_host: ${_param:openstack_telemetry_service_hostname}.${linux:system:domain}
# SSL
ceilometer_agent_ssl_enabled: False
openstack_mysql_x509_enabled: False
diff --git a/docker/host.yml b/docker/host.yml
index bb3dffa..a88ff2f 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -6,6 +6,7 @@
docker:
host:
pkgs:
+ - containerd.io
- docker-ce
- python-docker
experimental: true
diff --git a/jenkins/slave/docker.yml b/jenkins/slave/docker.yml
index 227dd51..169cb08 100644
--- a/jenkins/slave/docker.yml
+++ b/jenkins/slave/docker.yml
@@ -17,5 +17,7 @@
commands:
- /usr/bin/docker
package:
+ containerd.io:
+ version: latest
docker-ce:
version: latest
diff --git a/linux/network/hosts/openstack.yml b/linux/network/hosts/openstack/init.yml
similarity index 100%
rename from linux/network/hosts/openstack.yml
rename to linux/network/hosts/openstack/init.yml
diff --git a/linux/network/hosts/openstack/kmn.yml b/linux/network/hosts/openstack/kmn.yml
new file mode 100644
index 0000000..a6c7663
--- /dev/null
+++ b/linux/network/hosts/openstack/kmn.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ network:
+ host:
+ openstack_kmn_control_vip:
+ address: ${_param:openstack_barbican_address}
+ names:
+ - ${_param:openstack_kmn_service_hostname}
+ - ${_param:openstack_kmn_service_host}
diff --git a/linux/network/hosts/openstack/share.yml b/linux/network/hosts/openstack/share.yml
new file mode 100644
index 0000000..75a6449
--- /dev/null
+++ b/linux/network/hosts/openstack/share.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ network:
+ host:
+ openstack_share_control_vip:
+ address: ${_param:openstack_share_address}
+ names:
+ - ${_param:openstack_share_service_hostname}
+ - ${_param:openstack_share_service_host}
diff --git a/linux/network/hosts/openstack/telemetry.yml b/linux/network/hosts/openstack/telemetry.yml
new file mode 100644
index 0000000..77f48b0
--- /dev/null
+++ b/linux/network/hosts/openstack/telemetry.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ network:
+ host:
+ openstack_telemetry_control_vip:
+ address: ${_param:openstack_telemetry_address}
+ names:
+ - ${_param:openstack_telemetry_service_hostname}
+ - ${_param:openstack_telemetry_service_host}