Skip to content

Commit

Permalink
Merge pull request #325 from sdatko/epsilon-ceph
Browse files Browse the repository at this point in the history
Enable Ceph in uni05epsilon

This change adds the Ceph nodes in uni05epsilon
and configures Cinder and Glance services to use it.
The implementation is inspired by uni03gamma AKA va/hci.
It also removes Octavia from kustomizations, as it is not functional yet anyway
and probably it's setup will be handled differently. The network definition
remains though there in the control-plane/nncp/values.yaml to be reused.
The change requires shuffling in services configuration, e.g. Cinder and Glance needs
to be set in later step, so the corresponding readme updates were introduced.

Reviewed-by: Luigi Toscano
Reviewed-by: Szymon Datko
Reviewed-by: Andrew Bays <[email protected]>
Reviewed-by: John Fulton <[email protected]>
  • Loading branch information
2 parents ed224d8 + 2fe4202 commit 26f9824
Show file tree
Hide file tree
Showing 31 changed files with 1,001 additions and 886 deletions.
41 changes: 35 additions & 6 deletions automation/vars/uni05epsilon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,35 @@ vas:
src_file: service-values.yaml
build_output: control-plane.yaml

- path: examples/dt/uni05epsilon/edpm-pre-ceph/nodeset
wait_conditions:
- >-
oc -n openstack wait osdpns
openstack-edpm
--for condition=SetupReady
--timeout=10m
values:
- name: edpm-nodeset-values
src_file: values.yaml
build_output: nodeset-pre-ceph.yaml

- path: examples/dt/uni05epsilon/edpm-pre-ceph/deployment
wait_conditions:
- >-
oc -n openstack wait osdpd
edpm-deployment-pre-ceph
--for condition=Ready
--timeout=30m
values:
- name: edpm-deployment-values
src_file: values.yaml
build_output: deployment-pre-ceph.yaml
post_stage_run:
- name: Deploy Ceph
type: playbook
source: "../../playbooks/ceph.yml"
inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml"

- path: examples/dt/uni05epsilon
wait_conditions:
- >-
Expand All @@ -37,19 +66,19 @@ vas:
--timeout=10m
values:
- name: service-values
src_file: control-plane/service-values.yaml
- name: edpm-nodeset-values
src_file: service-values.yaml
- name: edpm-nodeset-values-post-ceph
src_file: values.yaml
build_output: edpm-nodeset.yaml
build_output: nodeset-post-ceph.yaml

- path: examples/dt/uni05epsilon/deployment
wait_conditions:
- >-
oc -n openstack wait osdpd
edpm-deployment
edpm-deployment-post-ceph
--for condition=Ready
--timeout=40m
values:
- name: edpm-deployment-values
- name: edpm-deployment-values-post-ceph
src_file: values.yaml
build_output: edpm.yaml
build_output: deployment-post-ceph.yaml
33 changes: 33 additions & 0 deletions dt/uni05epsilon/edpm-post-ceph/deployment/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

transformers:
- |-
apiVersion: builtin
kind: NamespaceTransformer
metadata:
name: _ignored_
namespace: openstack
setRoleBindingSubjects: none
unsetOnly: true
fieldSpecs:
- path: metadata/name
kind: Namespace
create: true
components:
- ../../../../lib/dataplane/deployment

replacements:
- source:
kind: ConfigMap
name: edpm-deployment-values-post-ceph
fieldPath: data.deployment.name
targets:
- select:
kind: OpenStackDataPlaneDeployment
fieldPaths:
- metadata.name
options:
create: true
Loading

0 comments on commit 26f9824

Please sign in to comment.