openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
(cherry picked from commit 020ad398d5)
This commit is contained in:
Francesco Pantano 2020-01-07 09:24:06 +01:00
parent a23a44fe7f
commit dc4ecf7974
No known key found for this signature in database
GPG Key ID: 799868C47301D458
8 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario000-multinode-containers.yaml
View File

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

1
ci/environments/scenario001-multinode-containers.yaml
View File

@ -121,6 +121,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
View File

@ -72,6 +72,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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -267,6 +267,13 @@ parameters:
mode: "0600"
dashboard_enabled: false
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
@ -570,6 +577,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