move order of ceph installation in cloud deploy pipeline
PROD-16532
Change-Id: If50e9794c9f1f667a4a6ca80b8e6eea45bda6bf0
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 74d7cde..4b25488 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -296,26 +296,6 @@
}
}
- // install ceph
- if (common.checkContains('STACK_INSTALL', 'ceph')) {
- stage('Install Ceph MONs') {
- orchestrate.installCephMon(venvPepper)
- }
-
- stage('Install Ceph OSDs') {
- orchestrate.installCephOsd(venvPepper)
- }
-
-
- stage('Install Ceph clients') {
- orchestrate.installCephClient(venvPepper)
- }
-
- stage('Connect Ceph') {
- orchestrate.connectCeph(venvPepper)
- }
- }
-
// install k8s
if (common.checkContains('STACK_INSTALL', 'k8s')) {
@@ -421,6 +401,26 @@
}
+ // install ceph
+ if (common.checkContains('STACK_INSTALL', 'ceph')) {
+ stage('Install Ceph MONs') {
+ orchestrate.installCephMon(venvPepper)
+ }
+
+ stage('Install Ceph OSDs') {
+ orchestrate.installCephOsd(venvPepper)
+ }
+
+
+ stage('Install Ceph clients') {
+ orchestrate.installCephClient(venvPepper)
+ }
+
+ stage('Connect Ceph') {
+ orchestrate.connectCeph(venvPepper)
+ }
+ }
+
if (common.checkContains('STACK_INSTALL', 'oss')) {
stage('Install Oss infra') {
orchestrate.installOssInfra(venvPepper)