From 020ad398d5c921dbdd184a499f1214b1f15212f9 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 7 Jan 2020 09:24:06 +0100 Subject: [PATCH] Add ceph_ansible_repo variable on ceph-base In order to properly evaluate the ceph-ansible repo using validations, this change adds the "ceph_ansible_repo" variable to point to the correct default tripleo ceph repo. Change-Id: Ib398bbb5765fbe87f8e37d7a58b356f7d4670c87 Related-Bug: 1857460 --- ci/environments/scenario000-multinode-containers.yaml | 1 + ci/environments/scenario000-standalone.yaml | 1 + ci/environments/scenario001-multinode-containers.yaml | 1 + ci/environments/scenario001-standalone.yaml | 1 + ci/environments/scenario004-multinode-containers.yaml | 1 + ci/environments/scenario004-standalone.yaml | 1 + ci/environments/scenario010-multinode-containers.yaml | 1 + ci/environments/scenario010-standalone.yaml | 1 + deployment/ceph-ansible/ceph-base.yaml | 8 ++++++++ 9 files changed, 16 insertions(+) diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml index 7f86f75914..8c373cd9e0 100644 --- a/ci/environments/scenario000-multinode-containers.yaml +++ b/ci/environments/scenario000-multinode-containers.yaml @@ -33,4 +33,5 @@ parameter_defaults: Debug: true DockerPuppetDebug: True NotificationDriver: 'noop' + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" ContainerCli: podman diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index b9ec025eb4..eb5d06222d 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -212,4 +212,5 @@ resource_registry: parameter_defaults: Debug: true NotificationDriver: 'noop' + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" ContainerCli: podman diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 46c105f194..65aa485953 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -117,6 +117,7 @@ parameter_defaults: journal_size: 512 osd_scenario: collocated CephPoolDefaultPgNum: 32 + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" CephPoolDefaultSize: 1 CephPools: - name: altrbd diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 4de9eb6753..ca601885d6 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -70,6 +70,7 @@ parameter_defaults: CephPoolDefaultPgNum: 32 CephPoolDefaultSize: 1 CephEnableDashboard: true + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" CephAnsibleExtraConfig: centos_package_dependencies: [] ceph_osd_docker_memory_limit: '1g' diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 7de4b070a7..b59f49a80b 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -104,6 +104,7 @@ parameter_defaults: CephPoolDefaultPgNum: 16 ManilaCephFSDataPoolPGNum: 16 ManilaCephFSMetadataPoolPGNum: 16 + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" CephPoolDefaultSize: 1 CephAnsibleExtraConfig: centos_package_dependencies: [] diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 77947af5a2..cadf88fadc 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -64,6 +64,7 @@ parameter_defaults: CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephAnsiblePlaybookVerbosity: 1 + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" CephAnsibleEnvironmentVariables: ANSIBLE_SSH_RETRIES: '4' DEFAULT_FORKS: '3' diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index 997f77a6b1..cca589b030 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/ci/environments/scenario010-multinode-containers.yaml @@ -107,6 +107,7 @@ parameter_defaults: # a production deployment. What is here is suitable for # developer and CI testing only. CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" CephClusterName: mycephcluster CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml index 12af30c87f..797b938f26 100644 --- a/ci/environments/scenario010-standalone.yaml +++ b/ci/environments/scenario010-standalone.yaml @@ -72,6 +72,7 @@ parameter_defaults: DEFAULT_FORKS: '3' NovaEnableRbdBackend: true CinderEnableRbdBackend: true + CephAnsibleRepo: "tripleo-centos-ceph-nautilus" CinderBackupBackend: ceph GlanceBackend: rbd CinderEnableIscsiBackend: false diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index 73d2f51c87..c5c35fbbaf 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -239,6 +239,13 @@ parameters: key: "AQBRgQ9eAAAAABAAv84zEilJYZPNuJ0Iwn9Ndg==" mode: "0600" default: [] + CephAnsibleRepo: + type: string + description: | + The repository that should be used to install the right ceph-ansible + package. This value can be used by tripleo-validations to double check + the right ceph-ansible version is installed. + default: 'centos-ceph-nautilus' parameter_groups: - label: deprecated @@ -542,6 +549,7 @@ outputs: tasks_from: ceph-ansible-installed vars: fail_without_ceph_ansible: true + ceph_ansible_repo: {get_param: CephAnsibleRepo} tags: - opendev-validation - opendev-validation-ceph