Merge "Defined `use_vip_address` and `host` fields to `message_queue` section." into release/proposed/2019.2.0
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 8781811..1391a61 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -195,3 +195,4 @@
813: --include='universe/g/glibc/' # PROD-35417 Req for rabbitmq 3.8.2
814: --include='universe/o/opensaml2' # PROD-35464 Req for SAML2/Federation
815: --include='universe/x/xmltooling' # PROD-35464 Req for SAML2/Federation
+ 816: --include='main/a/accountsservice' # PROD-36001 Req for cfg01 upgrade
diff --git a/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
index 5ed6905..86dee32 100644
--- a/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
@@ -195,3 +195,4 @@
813: --include='universe/g/glibc/' # PROD-35417 Req for rabbitmq 3.8.2
814: --include='universe/o/opensaml2' # PROD-35464 Req for SAML2/Federation
815: --include='universe/x/xmltooling' # PROD-35464 Req for SAML2/Federation
+ 816: --include='main/a/accountsservice' # PROD-36001 Req for cfg01 upgrade
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 6491f5c..a78bd6e 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -169,3 +169,4 @@
- staticMethod org.codehaus.groovy.runtime.EncodingGroovyMethods encodeBase64 byte[]
- staticMethod org.codehaus.groovy.runtime.ScriptBytecodeAdapter bitwiseNegate java.lang.Object
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods max java.util.Collection
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods removeElement java.util.Collection java.lang.Object
diff --git a/jenkins/client/job/ceph/add-node.yml b/jenkins/client/job/ceph/add-node.yml
index 1c8f234..258bc76 100644
--- a/jenkins/client/job/ceph/add-node.yml
+++ b/jenkins/client/job/ceph/add-node.yml
@@ -16,7 +16,6 @@
credentials: ${_param:jenkins_gerrit_credentials}
script: ceph-add-node.groovy
param:
- # general parameters
SALT_MASTER_URL:
type: string
description: URL of Salt master
@@ -27,9 +26,17 @@
default: salt
HOST:
type: string
- description: OSD HOST that will be added to Ceph cluster (rgw04*)
- default: 'rgw04*'
- HOST_TYPE:
+ description: OSD HOST that will be added to Ceph cluster (e.g. rgw04*)
+ default: ''
+ CLUSTER_FLAGS:
type: string
- description: Type of Ceph node to be added. Valid values are mon/osd/rgw
- default: 'rgw'
+ description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
+ default: ''
+ OSD_ONLY:
+ type: boolean
+ default: 'false'
+ description: Add only missing OSDs while keep HOST itself intact
+ USE_UPMAP:
+ type: boolean
+ default: 'false'
+ description: Use upmap balancer to smooth data migrations
diff --git a/jenkins/client/job/ceph/add-osd-upmap.yml b/jenkins/client/job/ceph/add-osd-upmap.yml
index a96a303..1c1ccb1 100644
--- a/jenkins/client/job/ceph/add-osd-upmap.yml
+++ b/jenkins/client/job/ceph/add-osd-upmap.yml
@@ -28,7 +28,7 @@
default: salt
HOST:
type: string
- description: OSD HOST that will be added to Ceph cluster (rgw04*)
+ description: OSD HOST that will be added to Ceph cluster
default: 'osd*'
CLUSTER_FLAGS:
type: string
diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
index aa32c4c..9fdd102 100644
--- a/jenkins/client/job/ceph/remove-node.yml
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -27,26 +27,27 @@
default: salt
HOST:
type: string
- description: OSD HOST that will be removed from Ceph cluster (rgw04*)
- default: 'rgw04*'
- HOST_TYPE:
+ description: HOST to remove from thecluster
+ OSD:
type: string
- description: Type of Ceph node to be removed. Valid values are mon/osd/rgw
- default: 'rgw'
- ADMIN_HOST:
+ description: Remove only those OSDs at HOST (comma-separated list or *). Leave empty if you going to remove a whole osd node. Only relevant with OSD node
+ default: ''
+ CLUSTER_FLAGS:
type: string
- description: Host with admin keyring and access to cluster management
- default: 'cmn01*'
- GENERATE_CRUSHMAP:
- type: boolean
- default: 'false'
- 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.
+ description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
WAIT_FOR_HEALTHY:
type: boolean
default: 'true'
description: Wait for healthy during pipeline
- CLEANDISK:
+ CLEAN_ORPHANS:
type: boolean
default: 'false'
- description: Clean data/block partitions
-
+ description: Clean orphaned ceph partition which are no longer part of cluster. Only relevant with osd hosts and required Luminous ceph-disk
+ FAST_WIPE:
+ type: boolean
+ default: 'true'
+ description: Wipe only partition table of each removed disk. Otherwise whole disk will be wiped. Only relevant with osd hosts
+ GENERATE_CRUSHMAP:
+ type: boolean
+ default: 'false'
+ description: Generate new crush map
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
index ce2037b..1565ab5 100644
--- a/jenkins/client/job/ceph/remove-osd.yml
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -32,10 +32,6 @@
type: string
description: These OSDs at HOST will be removed (comma-separated list)
default: '*'
- ADMIN_HOST:
- type: string
- description: Host with admin keyring and access to cluster management
- default: 'cmn01*'
CLUSTER_FLAGS:
type: string
description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
@@ -43,10 +39,10 @@
type: boolean
default: 'true'
description: Wait for healthy during pipeline
- CLEANDISK:
+ FAST_WIPE:
type: boolean
- default: 'false'
- description: Clean data/block partitions
+ default: 'true'
+ description: Wipe only partition table of each removed disk. Otherwise whole disk will be wiped. Only relevant with osd hosts
CLEAN_ORPHANS:
type: boolean
default: 'false'