Merge "Add cluster_local_address to allowed alternative names for etcd server certificate in single mode."
diff --git a/ceph/rgw/cluster.yml b/ceph/rgw/cluster.yml
index fbee1fc..31aae9a 100644
--- a/ceph/rgw/cluster.yml
+++ b/ceph/rgw/cluster.yml
@@ -1,7 +1,5 @@
classes:
- system.haproxy.proxy.single
- system.haproxy.proxy.listen.radosgw
-- system.linux.system.repo.ceph
-- system.linux.system.repo.ubuntu
- service.keepalived.cluster.single
- service.ceph.radosgw.cluster
diff --git a/ceph/rgw/single.yml b/ceph/rgw/single.yml
index 4dba033..c140ec8 100644
--- a/ceph/rgw/single.yml
+++ b/ceph/rgw/single.yml
@@ -1,4 +1,2 @@
classes:
-- system.linux.system.repo.ceph
-- system.linux.system.repo.ubuntu
- service.ceph.radosgw.single
diff --git a/jenkins/client/job/ceph/backend-migration.yml b/jenkins/client/job/ceph/backend-migration.yml
index e0dc091..a8736a2 100644
--- a/jenkins/client/job/ceph/backend-migration.yml
+++ b/jenkins/client/job/ceph/backend-migration.yml
@@ -43,6 +43,14 @@
type: boolean
default: 'true'
description: Wait for healthy during pipeline
+ PER_OSD_CONTROL:
+ type: boolean
+ default: 'true'
+ description: Set to true if Ceph status verification after every osd disk migration is desired
+ PER_OSD_HOST_CONTROL:
+ type: boolean
+ default: 'true'
+ description: Set to true if Ceph status verificaton after whole OSD host migration is desired
ORIGIN_BACKEND:
type: string
description: Ceph backend before migration
diff --git a/jenkins/client/job/ceph/upgrade.yml b/jenkins/client/job/ceph/upgrade.yml
index bf8e9e4..9b58f3b 100644
--- a/jenkins/client/job/ceph/upgrade.yml
+++ b/jenkins/client/job/ceph/upgrade.yml
@@ -64,3 +64,11 @@
type: boolean
default: 'true'
description: Set to True if Ceph client nodes upgrade is desired (includes for example ctl/cmp nodes)
+ STAGE_FINALIZE:
+ type: boolean
+ default: 'true'
+ description: Set to True if configs recommended for TARGET_RELEASE should be set after upgrade is done
+ BACKUP_ENABLED:
+ type: boolean
+ default: 'true'
+ description: Set to True if disks of Ceph VMs should be copied before upgrade
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 2430724..699ea82 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -71,6 +71,9 @@
- name: docker
upload_source_package: false
dist: trusty
+ - name: dogtag
+ upload_source_package: false
+ dist: trusty
- name: dovecot
upload_source_package: false
dist: trusty
@@ -374,6 +377,9 @@
- name: docker
upload_source_package: true
dist: xenial
+ - name: dogtag
+ upload_source_package: true
+ dist: xenial
- name: dovecot
upload_source_package: true
dist: xenial
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 892ca76..236e4d6 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -29,6 +29,7 @@
- name: dekapod
- name: devops-portal
- name: docker
+ - name: dogtag
- name: dovecot
- name: elasticsearch
- name: etcd
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 1cc904d..5e7e82b 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -153,6 +153,12 @@
RECLASS_MODEL_BRANCH:
type: string
default: master
+ SYSTEM_GIT_URL:
+ type: string
+ default: ""
+ SYSTEM_GIT_REF:
+ type: string
+ default: ""
PARALLEL_NODE_GROUP_SIZE:
type: string
default: "1"
diff --git a/kubernetes/control/init.yml b/kubernetes/control/init.yml
index 87aee26..6e5fb40 100644
--- a/kubernetes/control/init.yml
+++ b/kubernetes/control/init.yml
@@ -1,3 +1,2 @@
classes:
- service.kubernetes.control.cluster
- - system.linux.system.repo.docker_legacy
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index 4164267..f21f003 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -3,7 +3,6 @@
- service.keepalived.cluster.single
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker_legacy
parameters:
_param:
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index a546233..cc8d8ab 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -1,6 +1,5 @@
classes:
- service.kubernetes.master.single
-- system.linux.system.repo.docker_legacy
parameters:
_param:
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 252a0b7..0f961a3 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -1,7 +1,6 @@
classes:
- service.kubernetes.pool.cluster
- service.docker.host
-- system.linux.system.repo.docker_legacy
parameters:
_param:
# component docker images
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index c2505bb..00f22b8 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -1,7 +1,6 @@
classes:
- service.kubernetes.pool.single
- service.docker.host
-- system.linux.system.repo.docker_legacy
parameters:
_param:
# component docker images