Browse Source

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
changes/38/701338/4
Francesco Pantano 2 years ago
parent
commit
020ad398d5
No known key found for this signature in database GPG Key ID: 799868C47301D458
  1. 1
      ci/environments/scenario000-multinode-containers.yaml
  2. 1
      ci/environments/scenario000-standalone.yaml
  3. 1
      ci/environments/scenario001-multinode-containers.yaml
  4. 1
      ci/environments/scenario001-standalone.yaml
  5. 1
      ci/environments/scenario004-multinode-containers.yaml
  6. 1
      ci/environments/scenario004-standalone.yaml
  7. 1
      ci/environments/scenario010-multinode-containers.yaml
  8. 1
      ci/environments/scenario010-standalone.yaml
  9. 8
      deployment/ceph-ansible/ceph-base.yaml

1
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

1
ci/environments/scenario000-standalone.yaml

@ -212,4 +212,5 @@ resource_registry:
parameter_defaults:
Debug: true
NotificationDriver: 'noop'
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
ContainerCli: podman

1
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

1
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'

1
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: []

1
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'

1
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=='

1
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

8
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

Loading…
Cancel
Save