Merge "Adding watchdog"
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
new file mode 100644
index 0000000..bc67493
--- /dev/null
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -0,0 +1,31 @@
+classes:
+- service.ceilometer.agent.cluster.common
+parameters:
+ ceilometer:
+ agent:
+ region: ${_param:openstack_region}
+ enabled: true
+ version: ${_param:ceilometer_version}
+ secret: ${_param:ceilometer_secret_key}
+ identity:
+ engine: keystone
+ host: ${_param:keystone_service_host}
+ port: 35357
+ tenant: service
+ user: ceilometer
+ password: ${_param:keystone_ceilometer_password}
+ region: ${_param:openstack_region}
+ message_queue:
+ engine: rabbitmq
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ ha_queues: true
+ nova:
+ compute:
+ notification:
+ driver: messagingv2
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
new file mode 100644
index 0000000..6b42537
--- /dev/null
+++ b/ceilometer/agent/telemetry/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceilometer.agent.single.common
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 19336b0..f965451 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -1,3 +1,4 @@
+# This class is deprecated since Openstack Pike
classes:
- service.ceilometer.server.cluster
- service.haproxy.proxy.single
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
new file mode 100644
index 0000000..d1c28ef
--- /dev/null
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -0,0 +1,36 @@
+# This class intended to be used since Openstack Pike release
+classes:
+- service.ceilometer.server.cluster.common
+- system.keepalived.cluster.instance.openstack_telemetry_vip
+parameters:
+ ceilometer:
+ server:
+ enabled: true
+ version: ${_param:ceilometer_version}
+ region: ${_param:openstack_region}
+ cluster: true
+ secret: ${_param:ceilometer_secret_key}
+ ttl: 86400
+ notification:
+ workload_partitioning: true
+ batch_timeout: 30
+ bind:
+ host: ${_param:cluster_local_address}
+ port: 8777
+ identity:
+ engine: keystone
+ host: ${_param:openstack_control_address}
+ port: 35357
+ tenant: service
+ user: ceilometer
+ password: ${_param:keystone_ceilometer_password}
+ region: ${_param:openstack_region}
+ message_queue:
+ engine: rabbitmq
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
new file mode 100644
index 0000000..7a98b73
--- /dev/null
+++ b/ceilometer/server/telemetry/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceilometer.server.single.common
diff --git a/docker/swarm/stack/monitoring/alerta.yml b/docker/swarm/stack/monitoring/alerta.yml
index c0da7d5..858eb38 100644
--- a/docker/swarm/stack/monitoring/alerta.yml
+++ b/docker/swarm/stack/monitoring/alerta.yml
@@ -27,4 +27,5 @@
- ${prometheus:alerta:config_dir}/alerta.conf:/web/config.js
environment:
ADMIN_USERS: ${_param:alerta_admin_username}
- MONGO_URI: ${_param:alerta_mongodb_uri}
\ No newline at end of file
+ ADMIN_PASSWORD: ${_param:alerta_admin_password}
+ MONGO_URI: ${_param:alerta_mongodb_uri}
diff --git a/horizon/server/plugin/theme.yml b/horizon/server/plugin/theme.yml
index 85475d7..cf83739 100644
--- a/horizon/server/plugin/theme.yml
+++ b/horizon/server/plugin/theme.yml
@@ -10,3 +10,12 @@
source:
engine: pkg
name: openstack-dashboard-${_param:horizon_dashboard_theme}-theme
+ themes:
+ default: "mirantis"
+ available:
+ mirantis:
+ name: "Mirantis"
+ description: "Mirantis theme"
+ enabled: True
+ material:
+ enabled: False
diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
index af678b5..901e319 100644
--- a/jenkins/client/job/ceph/remove-node.yml
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -43,5 +43,5 @@
description: Only if removing OSD host. Set to true if crush map file should be updated. Enforce has to happen manually unless it is specifically set to be enforced in pillar.
WAIT_FOR_HEALTHY:
type: boolean
- default: 'false'
+ default: 'true'
description: Wait for healthy during pipeline
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
index 0a5801d..99dcb37 100644
--- a/jenkins/client/job/ceph/remove-osd.yml
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -41,5 +41,5 @@
description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
WAIT_FOR_HEALTHY:
type: boolean
- default: 'false'
+ default: 'true'
description: Wait for healthy during pipeline
diff --git a/jenkins/client/job/ceph/replace-failed-osd.yml b/jenkins/client/job/ceph/replace-failed-osd.yml
index 43c2f0b..a342ffb 100644
--- a/jenkins/client/job/ceph/replace-failed-osd.yml
+++ b/jenkins/client/job/ceph/replace-failed-osd.yml
@@ -34,6 +34,9 @@
DEVICE:
type: string
description: Comma separated list of failed devices that will be replaced at HOST (/dev/sdb,/dev/sdc)
+ DATA_PARTITION:
+ type: string
+ description: (Optional) Comma separated list of mounted partitions of failed device. These partitions will be unmounted. For ex. /dev/sdb1,/dev/sdb3
JOURNAL_BLOCKDB_BLOCKWAL_PARTITION:
type: string
description: Comma separated list of partitions where journal, block_db or block_wal for the failed devices on this HOST were stored (/dev/sdh2,/dev/sdh3)
@@ -43,7 +46,7 @@
default: 'cmn01*'
WAIT_FOR_HEALTHY:
type: boolean
- default: 'false'
+ default: 'true'
description: Wait for healthy during pipeline
DMCRYPT:
type: boolean
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index f977997..0680c06 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -20,8 +20,8 @@
# component docker images
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
kubernetes_calico_calicoctl_image: ${_param:kubernetes_calico_calicoctl_repo}/ctl:v1.6.4
- kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.9
- kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.5
+ kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.10
+ kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.6
kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.10.4-4
kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.10.4-4
kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
@@ -107,28 +107,6 @@
criproxy_source: ${_param:kubernetes_criproxy_checksum}
metallb:
enabled: ${_param:kubernetes_metallb_enabled}
- master:
- enabled: false
- kubelet:
- fail_on_swap: ${_param:kubelet_fail_on_swap}
- container: false
- network:
- genie:
- enabled: ${_param:kubernetes_genie_enabled}
- source: ${_param:kubernetes_genie_source}
- source_hash: ${_param:kubernetes_genie_source_hash}
- calico:
- enabled: ${_param:kubernetes_calico_enabled}
- image: ${_param:kubernetes_calico_image}
- calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
- cni_image: ${_param:kubernetes_calico_cni_image}
- opencontrail:
- enabled: ${_param:kubernetes_opencontrail_enabled}
- cni_image: ${_param:kubernetes_contrail_cni_image}
- sriov:
- enabled: ${_param:kubernetes_sriov_enabled}
- source: ${_param:kubernetes_sriov_source}
- source_hash: ${_param:kubernetes_sriov_source_hash}
pool:
enabled: false
kubelet:
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index 5d0933c..7cddd21 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -3,13 +3,10 @@
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.keepalived.cluster.instance.kube_api_server_vip
-- system.kubernetes.common
+- system.kubernetes.master.common
parameters:
kubernetes:
master:
- enabled: true
- network:
calico:
prometheus:
enabled: true
-
diff --git a/kubernetes/master/common.yml b/kubernetes/master/common.yml
new file mode 100644
index 0000000..0923286
--- /dev/null
+++ b/kubernetes/master/common.yml
@@ -0,0 +1,26 @@
+classes:
+- system.kubernetes.common
+parameters:
+ kubernetes:
+ master:
+ enabled: true
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
+ container: false
+ network:
+ genie:
+ enabled: ${_param:kubernetes_genie_enabled}
+ source: ${_param:kubernetes_genie_source}
+ source_hash: ${_param:kubernetes_genie_source_hash}
+ calico:
+ enabled: ${_param:kubernetes_calico_enabled}
+ image: ${_param:kubernetes_calico_image}
+ calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+ cni_image: ${_param:kubernetes_calico_cni_image}
+ opencontrail:
+ enabled: ${_param:kubernetes_opencontrail_enabled}
+ cni_image: ${_param:kubernetes_contrail_cni_image}
+ sriov:
+ enabled: ${_param:kubernetes_sriov_enabled}
+ source: ${_param:kubernetes_sriov_source}
+ source_hash: ${_param:kubernetes_sriov_source_hash}
\ No newline at end of file
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index 1898549..31cbc28 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -1,7 +1,3 @@
classes:
- service.kubernetes.master.single
-- system.kubernetes.common
-parameters:
- kubernetes:
- master:
- enabled: true
+- system.kubernetes.master.common