[DCN] Adding cinderBackups to controlplane#762
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: gais-ameer-rh The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Hi @gais-ameer-rh. Thanks for your PR. I'm waiting for a openstack-k8s-operators member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
This looks like the right idea. Let's see the testing results. |
8417cf5 to
c339136
Compare
| backup_ceph_pool = backups | ||
| backup_ceph_user = openstack | ||
| # Not implemented in this example | ||
| cinderBackups: |
There was a problem hiding this comment.
yes, we want cinderBackups here because ceph has been deployed.
|
|
||
| # --- Below are VA/DT-specific data --- | ||
| _change_me: later | ||
| cinderBackups: |
There was a problem hiding this comment.
I don't think we want cinderBackups here yet because ceph has not been deployed. cinderVolumes is not here either.
There was a problem hiding this comment.
removed the cinderBackups from here.
But cinderBackups: {} is injected to OpenStackControlPlane CR from examples/dt/dcn/control-plane/kustomization.yaml
| - networking/nncp/values.yaml | ||
| - service-values.yaml | ||
|
|
||
| replacements: |
There was a problem hiding this comment.
I don't think we want cinderBackups here yet because ceph has not been deployed. cinderVolumes is not here either.
There was a problem hiding this comment.
I replaced these lines with patches to inject cinderBackups: {} to base OpenStackControlPlane CR.
PS: cinderBackups is not defined in lib\control-plane.
524c85b to
d441bfb
Compare
| backup_ceph_conf = /etc/ceph/az0.conf | ||
| backup_ceph_pool = backups | ||
| backup_ceph_user = openstack | ||
| # Not implemented in this example |
There was a problem hiding this comment.
cinderBackup (singular) is deprecated; use cinderBackups (plural)
| backup_ceph_conf = /etc/ceph/az0.conf | ||
| backup_ceph_pool = backups | ||
| backup_ceph_user = openstack | ||
| # Not implemented in this example |
|
Worked with test project |
To deploy multiple cinder backups distributed across edge sites Removes the existing spec.cinder.template.cinderBackup (singluar) by setting repliacs to 0 and adds cinderBackups (plural) to controlplane Jira: OSPRH-28343 Signed-off-by: Gais Ameer <gameer@redhat.com>
d441bfb to
5b9c06d
Compare
|
Just showing the main changes from this patch. I. control plane pre-ceph has cinderBackups set but empty: II. control plane post-ceph has cinderBackups set correctly and a note about the deprecation: produces expected output: cinder:
apiOverride:
route: {}
template:
apiTimeout: 600
cinderAPI:
override:
service:
internal:
metadata:
annotations:
metallb.universe.tf/address-pool: internalapi
metallb.universe.tf/allow-shared-ip: internalapi
metallb.universe.tf/loadBalancerIPs: 172.17.0.80
spec:
type: LoadBalancer
replicas: 3
cinderBackup:
customServiceConfig: |
[DEFAULT]
# cinderBackup (singular) is deprecated; use cinderBackups (plural)
networkAttachments:
- storage
replicas: 0
cinderBackups:
az0:
customServiceConfig: |
[DEFAULT]
storage_availability_zone = az0
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
backup_ceph_conf = /etc/ceph/az0.conf
backup_ceph_pool = backups
backup_ceph_user = openstack
networkAttachments:
- storage
replicas: 2
az1:
customServiceConfig: |
[DEFAULT]
storage_availability_zone = az1
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
backup_ceph_conf = /etc/ceph/az1.conf
backup_ceph_pool = backups
backup_ceph_user = openstack
networkAttachments:
- storage
replicas: 2
az2:
customServiceConfig: |
[DEFAULT]
storage_availability_zone = az2
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
backup_ceph_conf = /etc/ceph/az2.conf
backup_ceph_pool = backups
backup_ceph_user = openstack
networkAttachments:
- storage
replicas: 2
cinderScheduler:
replicas: 1
cinderVolumes:
az0:
customServiceConfig: |
[DEFAULT]
enabled_backends = ceph
glance_api_servers = https://glance-az0-internal.openstack.svc:9292
[ceph]III. scale down has expected output (replicas set to 0 because we're scaling down). # cinderBackup (singular) is deprecated; use cinderBackups (plural)
networkAttachments:
- storage
replicas: 0
cinderBackups:
az0:
customServiceConfig: |
[DEFAULT]
storage_availability_zone = az0
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
backup_ceph_conf = /etc/ceph/az0.conf
backup_ceph_pool = backups
backup_ceph_user = openstack
networkAttachments:
- storage
replicas: 2
az1:
customServiceConfig: |
[DEFAULT]
storage_availability_zone = az1
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
backup_ceph_conf = /etc/ceph/az1.conf
backup_ceph_pool = backups
backup_ceph_user = openstack
networkAttachments:
- storage
replicas: 0
az2:
customServiceConfig: |
[DEFAULT]
storage_availability_zone = az2
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
backup_ceph_conf = /etc/ceph/az2.conf
backup_ceph_pool = backups
backup_ceph_user = openstack
networkAttachments:
- storage
replicas: 2 |
|
Let's merge the following first: |
To deploy multiple cinder backups distributed across edge sites
Removes the existing spec.cinder.template.cinderBackup (singluar) by setting repliacs to 0 and adds cinderBackups (plural)
Jira: OSPRH-28343
Signed-off-by: Gais Ameer gameer@redhat.com