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
This commit is contained in:
Francesco Pantano 2020-01-07 09:24:06 +01:00
parent 914ca3eb28
commit 020ad398d5
No known key found for this signature in database
GPG Key ID: 799868C47301D458
9 changed files with 16 additions and 0 deletions

View File

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

View File

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

View File

@ -117,6 +117,7 @@ parameter_defaults:
journal_size: 512 journal_size: 512
osd_scenario: collocated osd_scenario: collocated
CephPoolDefaultPgNum: 32 CephPoolDefaultPgNum: 32
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CephPoolDefaultSize: 1 CephPoolDefaultSize: 1
CephPools: CephPools:
- name: altrbd - name: altrbd

View File

@ -70,6 +70,7 @@ parameter_defaults:
CephPoolDefaultPgNum: 32 CephPoolDefaultPgNum: 32
CephPoolDefaultSize: 1 CephPoolDefaultSize: 1
CephEnableDashboard: true CephEnableDashboard: true
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CephAnsibleExtraConfig: CephAnsibleExtraConfig:
centos_package_dependencies: [] centos_package_dependencies: []
ceph_osd_docker_memory_limit: '1g' ceph_osd_docker_memory_limit: '1g'

View File

@ -104,6 +104,7 @@ parameter_defaults:
CephPoolDefaultPgNum: 16 CephPoolDefaultPgNum: 16
ManilaCephFSDataPoolPGNum: 16 ManilaCephFSDataPoolPGNum: 16
ManilaCephFSMetadataPoolPGNum: 16 ManilaCephFSMetadataPoolPGNum: 16
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CephPoolDefaultSize: 1 CephPoolDefaultSize: 1
CephAnsibleExtraConfig: CephAnsibleExtraConfig:
centos_package_dependencies: [] centos_package_dependencies: []

View File

@ -64,6 +64,7 @@ parameter_defaults:
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
CephAnsiblePlaybookVerbosity: 1 CephAnsiblePlaybookVerbosity: 1
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CephAnsibleEnvironmentVariables: CephAnsibleEnvironmentVariables:
ANSIBLE_SSH_RETRIES: '4' ANSIBLE_SSH_RETRIES: '4'
DEFAULT_FORKS: '3' DEFAULT_FORKS: '3'

View File

@ -107,6 +107,7 @@ parameter_defaults:
# a production deployment. What is here is suitable for # a production deployment. What is here is suitable for
# developer and CI testing only. # developer and CI testing only.
CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CephClusterName: mycephcluster CephClusterName: mycephcluster
CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='

View File

@ -72,6 +72,7 @@ parameter_defaults:
DEFAULT_FORKS: '3' DEFAULT_FORKS: '3'
NovaEnableRbdBackend: true NovaEnableRbdBackend: true
CinderEnableRbdBackend: true CinderEnableRbdBackend: true
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CinderBackupBackend: ceph CinderBackupBackend: ceph
GlanceBackend: rbd GlanceBackend: rbd
CinderEnableIscsiBackend: false CinderEnableIscsiBackend: false

View File

@ -239,6 +239,13 @@ parameters:
key: "AQBRgQ9eAAAAABAAv84zEilJYZPNuJ0Iwn9Ndg==" key: "AQBRgQ9eAAAAABAAv84zEilJYZPNuJ0Iwn9Ndg=="
mode: "0600" mode: "0600"
default: [] 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: parameter_groups:
- label: deprecated - label: deprecated
@ -542,6 +549,7 @@ outputs:
tasks_from: ceph-ansible-installed tasks_from: ceph-ansible-installed
vars: vars:
fail_without_ceph_ansible: true fail_without_ceph_ansible: true
ceph_ansible_repo: {get_param: CephAnsibleRepo}
tags: tags:
- opendev-validation - opendev-validation
- opendev-validation-ceph - opendev-validation-ceph