-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use multiple Ceph secrets in ci_dcn_site role
Without this patch the ci_dcn_site role creates one secret with all Ceph keys and distributes all of these keys to all DCN sites. This patch makes the role create one secret for each DCN site and only that secret is used at that site. The secret for each DCN site only has the keys that are required. This will make the testing consistent with the documentation. Additional secrets for Ceph configuration are created and `extraMounts` for both the control plane and each dataplane is extended to include the extra secrets so that not all of the Ceph keys are distributed. Jira: https://issues.redhat.com/browse/OSPRH-6603 Signed-off-by: John Fulton <fulton@redhat.com>
- Loading branch information
1 parent
743af33
commit 1003d8f
Showing
5 changed files
with
86 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- | ||
kind: Secret | ||
metadata: | ||
name: ceph-conf-files-{{ _az }} | ||
namespace: openstack | ||
type: Opaque | ||
apiVersion: v1 | ||
data: | ||
{% for __az in ['az0', _az] %} | ||
{{ __az ~ _tail_key }}: {{ lookup('file', _head ~ __az ~ _tail_key, rstrip=False) | b64encode }} | ||
{{ __az ~ _tail_conf }}: {{ lookup('file', _head ~ __az ~ _tail_conf, rstrip=False) | b64encode }} | ||
{% endfor %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- | ||
apiVersion: dataplane.openstack.org/v1beta1 | ||
kind: OpenStackDataPlaneNodeSet | ||
metadata: | ||
name: openstack-edpm | ||
spec: | ||
nodeTemplate: | ||
extraMounts: | ||
- extraVolType: Ceph | ||
mounts: | ||
- mountPath: /etc/ceph | ||
name: ceph | ||
readOnly: true | ||
volumes: | ||
- name: ceph | ||
secret: | ||
{% if _az != 'az0' %} | ||
secretName: ceph-conf-files-{{ _az }} | ||
{% else %} | ||
secretName: ceph-conf-files | ||
{% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters