diff --git a/automation/vars/uni-alpha.yaml b/automation/vars/uni-alpha.yaml new file mode 100644 index 000000000..510e9eefd --- /dev/null +++ b/automation/vars/uni-alpha.yaml @@ -0,0 +1,51 @@ +--- +vas: + uni-alpha: + stages: + - path: examples/dt/uni-alpha/control-plane/nncp + validations: + - >- + oc -n openstack wait nncp + -l osp/nncm-config-type=standard + --for jsoonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured + --timeout=60s + values: + - name: network-values + src_file: values.yaml + build_output: nncp.yaml + + - path: examples/dt/uni-alpha/control-plane + validations: + - >- + oc -n openstack wait openstackcontrolplane + controlplane + --for condition=Ready + values: + - name: network-values + - name: service-values + src_file: service-values.yaml + build_output: control-plane.yaml + + - path: examples/dt/uni-alpha/networker + validations: + - >- + oc -n openstack wait openstackdataplanedeployment + edpm-networker + --for condition=Ready + --timeout=1200s + values: + - name: edpm-networker-values + src_file: values.yaml + build_output: edpm-networker.yaml + + - path: examples/dt/uni-alpha + validations: + - >- + oc -n openstack wait openstackdataplanedeployment + edpm-deployment + --for condition=Ready + --timeout=1200s + values: + - name: edpm-values + src_file: values.yaml + build_outpu: edpm.yaml diff --git a/dt/uni-alpha/README.md b/dt/uni-alpha/README.md new file mode 100644 index 000000000..7fd20a643 --- /dev/null +++ b/dt/uni-alpha/README.md @@ -0,0 +1,11 @@ +# Deployed Topology - Alpha + +If you are looking for information on how to deploy the alpha based DT, then +please the [README](../../examples/dt/uni-alpha/README.md) in the examples +directory. + +This directory `dt/uni01alpha/`, exists so that the +[kustomization.yaml](../../examples/dt/uni-alpha/kustomization.yaml) in +the examples directory of uni01alpha topology, reference it by path as a +component. It's contents are likely uninteresting unless you want to understand +how kustomize was implemented in this repository. diff --git a/dt/uni-alpha/edpm/kustomization.yaml b/dt/uni-alpha/edpm/kustomization.yaml new file mode 100644 index 000000000..6830999ea --- /dev/null +++ b/dt/uni-alpha/edpm/kustomization.yaml @@ -0,0 +1,20 @@ +--- +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 diff --git a/dt/uni-alpha/kustomization.yaml b/dt/uni-alpha/kustomization.yaml new file mode 100644 index 000000000..aa3b22ee9 --- /dev/null +++ b/dt/uni-alpha/kustomization.yaml @@ -0,0 +1,190 @@ +--- +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/networking + - ../../lib/control-plane + +replacements: + - source: + kind: ConfigMap + name: service-values + fieldPath: data.cinderVolumes.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.cinder.template.cinderVolumes.customServiceConfig + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.cinderBackup.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.cinder.template.cinderBackup.customServiceConfig + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.cinderBackup.replicas + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.cinder.template.cinderBackup.replicas + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.glance.default.replicas + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.glance.template.glanceAPIs.default.replicas + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.glance.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.glance.template.customServiceConfig + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.glance.default.replicas + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.glance.template.glanceAPIs.default.replicas + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.swift.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.swift.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.ironic.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.ironic.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.octavia.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.octavia.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.autoscaling.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.template.autoscaling.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.ceilometer.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.template.ceilometer.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.ovn.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.ovn.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.neutron.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.neutron.template.customServiceConfig + options: + create: true diff --git a/dt/uni-alpha/namespace.yaml b/dt/uni-alpha/namespace.yaml new file mode 100644 index 000000000..60a6e8c42 --- /dev/null +++ b/dt/uni-alpha/namespace.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: builtin +kind: NamespaceTransformer +metadata: + name: _ignored_ + namespace: openstack +setRoleBindingSubjects: none +unsetOnly: true +fieldSpecs: + - path: metadata/name + kind: Namespace + create: true diff --git a/dt/uni-alpha/networker/kustomization.yaml b/dt/uni-alpha/networker/kustomization.yaml new file mode 100644 index 000000000..d8662c558 --- /dev/null +++ b/dt/uni-alpha/networker/kustomization.yaml @@ -0,0 +1,126 @@ +--- +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 + +resources: + - ../../../lib/dataplane/dataplane-ssh-secret.yaml + - ../../../lib/dataplane/openstackdataplanenodeset.yaml + - ../../../lib/dataplane/openstackdataplanedeployment.yaml + +patches: + - target: + kind: OpenStackDataPlaneDeployment + name: .* + patch: |- + - op: replace + path: metadata/name + value: networker-deploy + - target: + kind: OpenStackDataPlaneNodeSet + name: .* + patch: |- + - op: replace + path: metadata/name + value: networker-nodes + +replacements: + - source: + kind: ConfigMap + name: edpm-networker-values + fieldPath: data.nodeset.ansible + targets: + - select: + kind: OpenStackDataPlaneNodeSet + fieldPaths: + - spec.nodeTemplate.ansible + options: + create: true + + - source: + kind: ConfigMap + name: edpm-networker-values + fieldPath: data.nodeset.networks + targets: + - select: + kind: OpenStackDataPlaneNodeSet + fieldPaths: + - spec.nodeTemplate.networks + options: + create: true + + - source: + kind: ConfigMap + name: edpm-networker-values + fieldPath: data.nodeset.nodes + targets: + - select: + kind: OpenStackDataPlaneNodeSet + fieldPaths: + - spec.nodes + options: + create: true + + - source: + kind: ConfigMap + name: edpm-networker-values + fieldPath: data.nodeset.services + targets: + - select: + kind: OpenStackDataPlaneNodeSet + fieldPaths: + - spec.services + options: + create: true + + - source: + kind: ConfigMap + name: edpm-networker-values + fieldPath: data.ssh_keys.authorized + targets: + - select: + kind: Secret + name: dataplane-ansible-ssh-private-key-secret + fieldPaths: + - data.authorized_keys + options: + create: true + + - source: + kind: ConfigMap + name: edpm-networker-values + fieldPath: data.ssh_keys.private + targets: + - select: + kind: Secret + name: dataplane-ansible-ssh-private-key-secret + fieldPaths: + - data.ssh-privatekey + options: + create: true + + - source: + kind: ConfigMap + name: edpm-networker-values + fieldPath: data.ssh_keys.public + targets: + - select: + kind: Secret + name: dataplane-ansible-ssh-private-key-secret + fieldPaths: + - data.ssh-publickey + options: + create: true diff --git a/examples/dt/uni-alpha/.gitignore b/examples/dt/uni-alpha/.gitignore new file mode 100644 index 000000000..1ae5f072d --- /dev/null +++ b/examples/dt/uni-alpha/.gitignore @@ -0,0 +1 @@ +data-plane.yaml diff --git a/examples/dt/uni-alpha/README.md b/examples/dt/uni-alpha/README.md new file mode 100644 index 000000000..8563cf856 --- /dev/null +++ b/examples/dt/uni-alpha/README.md @@ -0,0 +1,154 @@ +# Deployed Topology - Alpha + +This document contains a list of integration test suites that would be +executed against the below specified topology of Red Hat OpenStack Services +on OpenShift. It also contains a collection of custom resources (CRs) for +deploying the test environment. + +## Purpose + +This topology is used for executing integration tests that evaluate the +`default` backends of the below mentioned services. + +## Environment + +### Nodes + +| Role | Machine Type | Count | +| ---- | ------------ | ----- | +| Compact OpenShift | vm | 3 | +| OpenStack Compute | vm | 2 | +| Networker | vm | 3 | +| Test nodes | vm | 2 | + +### Networks + +| Name | Type | Interface | +| ---- | ---- | --------- | +| Provisioning | untagged | nic1 | +| Machine | untagged | nic2 | +| RH OSP | trunk | nic3 | + +#### Networks in RH OSP + +| Name | Type | +| ---- | ---- | +| ctlplane | untagged | +| internalapi | VLAN tagged | +| Storage | VLAN tagged | +| Tenant | VLAN tagged | + +### Services, enabled features and configurations + +| Service | configuration | Lock-in coverage? | +| ---------------- | ---------------- | ------------------ | +| Cinder | LVM/iSCSI/lioadm | Must have | +| Cinder Backup | Swift | Must have | +| Glance | Swift | Must have | +| Swift | (default) | Must have | +| Octavia | (amphora) | Must have | +| Horizon | N/A | Must have | +| Barbican | (default) | Must have | +| Telemetry | | Must have | +| Ironic | | Must have | +| Neutron | OVN - AZs | Must have | + +#### Support services + +The following table lists services which are not the main focus of the testing +(which may be covered by additional scenarios), but are required for the DT to +work properly and can be deployed with any/default configuration. + +| Service | Reason | +| ---------------- |------------------ | +| Nova | needed by scenario testing | +| Keystone | needed by all services | + +### Additional configuration + +- Always-on, default services and features: TLSe +- Two additional fake baremetal nodes +- Availability zones for OVN (zone-1 & zone-2) +- Logical volume with the name cinder-volumes exists on a OpenShift node. +- iSCSI service is enabled on all OpenShift nodes. +- Multipath service is enabled on all OpenShift nodes. + +#### iSCSI + +It is assumed *iSCSI* services are enabled in all nodes participating in the +Red Hat OpenShift cluster. If not, a `MachineConfig` similar to the below one +is applied. The node needs to be *rebooted* after applying the configuration. + +```YAML +--- +apiVersion: machineconfiguration.openshift.io/v1 +kind: MachineConfig +metadata: + labels: + machineconfiguration.openshift.io/role: master + service: cinder + name: 90-master-cinder-enable-iscsid +spec: + config: + ignition: + version: 3.2.0 + systemd: + units: + - enabled: true + name: iscsid.service +``` + +### Multipath + +It is assumed *multipath* services are enabled in all nodes particpating in the +Red Hat OpenShift cluster. If not, a `MachineConfig` like the one below must be +applied. The node requires a *reboot* for the changes to be applied. + +```YAML +--- +apiVersion: machineconfiguration.openshift.io/v1 +kind: MachineConfig +metadata: + labels: + machineconfiguration.openshift.io/role: master + service: cinder + name: 91-master-cinder-enable-multipathd +spec: + config: + ignition: + version: 3.2.0 + storage: + files: + - path: /etc/multipath.conf + overwrite: false + # Mode must be decimal, this is 0600 + mode: 384 + user: + name: root + group: + name: root + contents: + # Source can be a http, https, tftp, s3, gs, or data as defined in rfc2397. + # This is the rfc2397 text/plain string format + source: data:,defaults%20%7B%0A%20%20user_friendly_names%20no%0A%20%20recheck_wwid%20yes%0A%20%20skip_kpartx%20yes%0A%20%20find_multipaths%20yes%0A%7D%0A%0Ablacklist%20%7B%0A%7D + systemd: + units: + - enabled: true + name: multipathd.service +``` + +## Testing + +| Test framework | When to run | Special configuration | +| ---------------- | -------------------- | ----------------------| +| relevant volume tests | tempest stage | | +| relevant image tests | tempest stage | | +| relevant object-storage tests | tempest stage | | +| relevant octavia tests | tempest stage | | +| horizon integration | own stage (post-tempest)| | + +## Workflow + +1. [Install the OpenStack K8S operators and their dependencies](../../common/README.md) +2. [Configure and deploy the OpenStack control plane](control-plane.md) +3. [Configure and deploy the OpenStack data plane](data-plane.md) diff --git a/examples/dt/uni-alpha/control-plane.md b/examples/dt/uni-alpha/control-plane.md new file mode 100644 index 000000000..c8c285cf7 --- /dev/null +++ b/examples/dt/uni-alpha/control-plane.md @@ -0,0 +1,55 @@ +# Configuring networking and deploy the OpenStack control plane + +## Assumptions + +- A storage class called `local-storage` should already exist. + +## Initialize + +Switch to the "openstack" namespace + +```bash +oc project openstack +``` + +Change to the uni-alpha directory + +```bash +cd architecture/examples/dt/uni-alpha +``` + +Edit [service-values.yaml](service-values.yaml) and +[nncp/values.yaml](nncp/values.yaml). + +Apply node network configuration + +```bash +pushd control-plane/nncp +kustomize build > nncp.yaml +oc apply -f nncp.yaml +oc wait nncp \ + -l osp/nncm-config-types=standard \ + --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured \ + --timeout=300s +popd +``` + +Generate the control-plane and networking CRs. + +```bash +pushd control-plane +kustomize build > control-plane.yaml +``` + +## Create CRs + +```bash +oc apply -f control-plane.yaml +popd +``` + +Wait for control plane to be available + +```bash +oc wait osctlplane controlplane --for condition=Ready --timeout=600s +``` diff --git a/examples/dt/uni-alpha/control-plane/.gitignore b/examples/dt/uni-alpha/control-plane/.gitignore new file mode 100644 index 000000000..3df8f53be --- /dev/null +++ b/examples/dt/uni-alpha/control-plane/.gitignore @@ -0,0 +1 @@ +control-plane.yaml diff --git a/examples/dt/uni-alpha/control-plane/kustomization.yaml b/examples/dt/uni-alpha/control-plane/kustomization.yaml new file mode 100644 index 000000000..1aba541cc --- /dev/null +++ b/examples/dt/uni-alpha/control-plane/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +components: + - ../../../../dt/uni-alpha + +resources: + - nncp/values.yaml + - service-values.yaml \ No newline at end of file diff --git a/examples/dt/uni-alpha/control-plane/nncp/.gitignore b/examples/dt/uni-alpha/control-plane/nncp/.gitignore new file mode 100644 index 000000000..51ed8a956 --- /dev/null +++ b/examples/dt/uni-alpha/control-plane/nncp/.gitignore @@ -0,0 +1 @@ +nncp.yaml diff --git a/examples/dt/uni-alpha/control-plane/nncp/kustomization.yaml b/examples/dt/uni-alpha/control-plane/nncp/kustomization.yaml new file mode 100644 index 000000000..0b92b40fb --- /dev/null +++ b/examples/dt/uni-alpha/control-plane/nncp/kustomization.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +transformers: + - |- + apiVersion: builtin + kind: NamespaceTransformer + metadata: + name: _ignored_ + namespace: openstack + setRoleBindingSubjects: none + unsetOnly: true + fieldSpecs: + - path: metadata/name + kind: Namespace + create: true + +components: + - ../../../../../lib/nncp + +resources: + - values.yaml diff --git a/examples/dt/uni-alpha/control-plane/nncp/values.yaml b/examples/dt/uni-alpha/control-plane/nncp/values.yaml new file mode 100644 index 000000000..1969e74b8 --- /dev/null +++ b/examples/dt/uni-alpha/control-plane/nncp/values.yaml @@ -0,0 +1,212 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: network-values + annotations: + config.kubernetes.io/local-config: "true" + +data: + openstack-operator-image: "quay.io/openstack-k8s-operators/openstack-operator-index:latest" + + node_0: + name: master-0 + internalapi_ip: 172.17.0.5 + tenant_ip: 172.19.0.5 + ctlplane_ip: 192.168.122.10 + storage_ip: 172.18.0.5 + node_1: + name: master-1 + internalapi_ip: 172.17.0.6 + tenant_ip: 172.19.0.6 + ctlplane_ip: 192.168.122.11 + storage_ip: 172.18.0.6 + node_2: + name: master-2 + internalapi_ip: 172.17.0.7 + tenant_ip: 172.19.0.7 + ctlplane_ip: 192.168.122.12 + storage_ip: 172.18.0.7 + + ctlplane: + dnsDomain: ctlplane.example.com + subnets: + - allocationRanges: + - end: 192.168.122.120 + start: 192.168.122.100 + - end: 192.168.122.200 + start: 192.168.122.150 + cidr: 192.168.122.0/24 + gateway: 192.168.122.1 + name: subnet1 + prefix-length: 24 + iface: enp6s0 + mtu: 9000 + lb_addresses: + - 192.168.122.80-192.168.122.90 + endpoint_annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + net-attach-def: | + { + "cniVersion": "0.3.1", + "name": "ctlplane", + "type": "macvlan", + "master": "ospbr", + "ipam": { + "type": "whereabouts", + "range": "192.168.122.0/24", + "range_start": "192.168.122.30", + "range_end": "192.168.122.70" + } + } + internalapi: + dnsDomain: internalapi.example.com + subnets: + - allocationRanges: + - end: 172.17.0.250 + start: 172.17.0.100 + cidr: 172.17.0.0/24 + name: subnet1 + vlan: 20 + mtu: 1500 + prefix-length: 24 + iface: internalapi + vlan: 20 + base_iface: enp6s0 + lb_addresses: + - 172.17.0.80-172.17.0.90 + endpoint_annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + net-attach-def: | + { + "cniVersion": "0.3.1", + "name": "internalapi", + "type": "macvlan", + "master": "internalapi", + "ipam": { + "type": "whereabouts", + "range": "172.17.0.0/24", + "range_start": "172.17.0.30", + "range_end": "172.17.0.70" + } + } + storage: + dnsDomain: storage.example.com + subnets: + - allocationRanges: + - end: 172.18.0.250 + start: 172.18.0.100 + cidr: 172.18.0.0/24 + name: subnet1 + vlan: 21 + mtu: 9000 + prefix-length: 24 + iface: storage + vlan: 21 + base_iface: enp6s0 + lb_addresses: + - 172.18.0.80-172.18.0.90 + net-attach-def: | + { + "cniVersion": "0.3.1", + "name": "storage", + "type": "macvlan", + "master": "storage", + "ipam": { + "type": "whereabouts", + "range": "172.18.0.0/24", + "range_start": "172.18.0.30", + "range_end": "172.18.0.70" + } + } + storagemgmt: + dnsDomain: storagemgmt.example.com + subnets: + - allocationRanges: + - end: 172.20.0.250 + start: 172.20.0.100 + cidr: 172.20.0.0/24 + name: subnet1 + vlan: 23 + mtu: 9000 + + tenant: + dnsDomain: tenant.example.com + subnets: + - allocationRanges: + - end: 172.19.0.250 + start: 172.19.0.100 + cidr: 172.19.0.0/24 + name: subnet1 + vlan: 22 + mtu: 1500 + prefix-length: 24 + iface: tenant + vlan: 22 + base_iface: enp6s0 + lb_addresses: + - 172.19.0.80-172.19.0.90 + net-attach-def: | + { + "cniVersion": "0.3.1", + "name": "tenant", + "type": "macvlan", + "master": "tenant", + "ipam": { + "type": "whereabouts", + "range": "172.19.0.0/24", + "range_start": "172.19.0.30", + "range_end": "172.19.0.70" + } + } + external: + dnsDomain: external.example.com + subnets: + - allocationRanges: + - end: 10.0.0.250 + start: 10.0.0.100 + cidr: 10.0.0.0/24 + gateway: 10.0.0.1 + name: subnet1 + mtu: 1500 + datacentre: + net-attach-def: | + { + "cniVersion": "0.3.1", + "name": "datacentre", + "type": "bridge", + "bridge": "ospbr", + "ipam": {} + } + dns-resolver: + config: + server: + - 192.168.122.1 + search: [] + options: + - key: server + values: + - 192.168.122.1 + + routes: + config: + - destination: 0.0.0.0/0 + next-hop-address: 192.168.122.1 + next-hop-interface: enp6s0 + + rabbitmq: + endpoint_annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.85 + rabbitmq-cell1: + endpoint_annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.86 + + lbServiceType: LoadBalancer + storageClass: host-nfs-storageclass + bridgeName: ospbr \ No newline at end of file diff --git a/examples/dt/uni-alpha/control-plane/service-values.yaml b/examples/dt/uni-alpha/control-plane/service-values.yaml new file mode 100644 index 000000000..a2f1bfd94 --- /dev/null +++ b/examples/dt/uni-alpha/control-plane/service-values.yaml @@ -0,0 +1,138 @@ +--- +apiVersion: v1 +kind: ConfigMap + +metadata: + name: service-values + annotations: + config.kubernetes.io/local-config: "true" + +data: + cinderVolumes: + customServiceConfig: | + [DEFAULT] + enabled_backends = lvm + + [lvm] + image_volume_cache_enabled = false + volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver + volume_group = cinder-volumes + target_protocol = iscsi + target_helper = lioadm + volume_backend_name = lvm_iscsi + + cinderBackup: + customServiceConfig: | + [DEFAULT] + backup_driver = cinder.backup.drivers.swift + replicas: 1 + + glance: + customServiceConfig: | + [DEFAULT] + enabled_backends = default_backend:swift + + [glance_store] + default_backend = default_backend + + [default_backend] + swift_store_create_container_on_put = True + swift_store_auth_version = 3 + swift_store_auth_address = {{ .KeystoneInternalURL }} + swift_store_endpoint_type = internalURL + swift_store_user = service:glance + swift_store_key = {{ .ServicePassword }} + default: + replicas: 1 + + ironic: + enabled: true + + swift: + enabled: true + + octavia: + enabled: true + + telemetry: + enabled: true + autoscaling: + enabled: true + ceilometer: + enabled: true + + ovn: + enabled: false + + neutron: + customServiceConfig: | + [DEFAULT] + dns_domain = openstackgate.local + vlan_transparent = true + service_plugins = qos,ovn-router,trunk,segments,port_forwarding,log + dhcp_agent_notification = false + agent_down_time = 600 + router_distributed = true + router_scheduler_driver = neutron.scheduler.l3_agent_scheduler.ChanceScheduler + allow_automatic_l3agent_failover = true + debug = true + log_dir = /var/log/neutron + default_availability_zones = zone-1,zone-2 + global_physnet_mtu = 9000 + + [agent] + report_interval = 300 + + [database] + max_retries = -1 + db_max_retries = -1 + + [keystone_authtoken] + region_name = regionOne + memcache_use_advanced_pool = True + auth_type = password + + [nova] + region_name = regionOne + endpoint_type = internal + + [oslo_messaging_notifications] + driver = noop + + [oslo_middleware] + enable_proxy_headers_parsing = true + + [oslo_policy] + policy_file = /etc/neutron/policy.yaml + + [placement] + region_name = regionOne + + [ovs] + igmp_snooping_enable = true + + [ovn] + ovsdb_probe_interval = 60000 + ovn_emit_need_to_frag = true + ovn_metadata_enabled = true + enable_distributed_floating_ip = true + + [ml2] + path_mtu = 9000 + type_drivers = geneve,vxlan,vlan,flat + tenant_network_types = geneve,flat + extension_drivers = qos,port_security,dns_domain_ports + + [ml2_type_flat] + flat_networks = datacentre + + [ml2_type_geneve] + vni_ranges = 1:65536 + max_header_size = 38 + + [ml2_type_vlan] + network_vlan_ranges = tenant:1000:2000 + + [ml2_type_vxlan] + vni_ranges = 1:65536 + vxlan_group = 224.0.0.1 diff --git a/examples/dt/uni-alpha/data-plane.md b/examples/dt/uni-alpha/data-plane.md new file mode 100644 index 000000000..9394e2611 --- /dev/null +++ b/examples/dt/uni-alpha/data-plane.md @@ -0,0 +1,62 @@ +# Deploying the OpenStack dataplane + +## Assumptions + +- The [control plane](control-plane.md) has been successfully deployed. + +## Initialize + +Switch to the "openstack" namespace + +```bash +oc project openstack +``` + +Change to the alpha's directory + +```bash +cd architecture/examples/dt/uni-alpha +``` + +Modify the [values.yaml](values.yaml) with the following information + +- SSH keys to be used for accessing the deployed compute nodes. +- SSH keys to be use for Nova migration. + +> All values must be in base64 encoded format. + +### Compute access + +1. Set `data['authorized']` with the value of all OpenStack Compute host SSH + keys. +2. Set `data['private']` with the contents of the SSH private key to be used + for accessing the dataplane compute nodes. +3. Set `data['public']` with the contents of the SSH public key used for + accessing the dataplane compute nodes. + +### Nova migration + +1. Set `data['nova']['migration']['ssh_keys']['private']` with the content of + the SSH private key to be used for potential future migration. +2. Set `data['nova']['migration']['ssh_keys']['public']` with the content of + the SSH public key to be used for potential future migration. + +## CRs + +Generate the dataplane CRs. + +```bash +kustomize build > data-plane.yaml +``` + +## Create CRs + +```bash +oc apply -f data-plane.yaml +``` + +Wait for dataplane deployment to finish + +```bash +oc wait osdpd edpm-deployment --for condition=Ready --timeout=1200s +``` diff --git a/examples/dt/uni-alpha/kustomization.yaml b/examples/dt/uni-alpha/kustomization.yaml new file mode 100644 index 000000000..08153172f --- /dev/null +++ b/examples/dt/uni-alpha/kustomization.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +components: + - ../../../dt/uni-alpha/edpm + +resources: + - values.yaml diff --git a/examples/dt/uni-alpha/networker.md b/examples/dt/uni-alpha/networker.md new file mode 100644 index 000000000..594efbe0d --- /dev/null +++ b/examples/dt/uni-alpha/networker.md @@ -0,0 +1,38 @@ +# Configuring and deploying Networker nodes + +## Assumptions + +- The [control plane](control-plane.md) has been created and successfully + deployed. + +## Steps + +```bash +# 1. Switch to openstack namespace + + $ oc project openstack + +# 2. Change the working directory to uni-alpha + + $ pushd architecture/examples/dt/uni-alpha + +# 3. Modify [networker/values.yaml](networker/values.yaml) file to suit your +# environment. + + $ pushd networker + $ vi values.yaml + +# 4. Generate the networker data plane deployment plan. + + $ kustomize build --load-restrictor LoadRestrictionsNone > \ + edpm-networker.yaml + +# 5. Create the CRs + + $ oc apply -f edpm-networker.yaml + +# 6. Wait for Networker data plane deployment to complete + + $ oc wait osdpd networker-plan --for condition=Ready --timeout=1200s + $ popd +``` diff --git a/examples/dt/uni-alpha/networker/.gitignore b/examples/dt/uni-alpha/networker/.gitignore new file mode 100644 index 000000000..e1774a409 --- /dev/null +++ b/examples/dt/uni-alpha/networker/.gitignore @@ -0,0 +1 @@ +edpm-networker.yaml diff --git a/examples/dt/uni-alpha/networker/kustomization.yaml b/examples/dt/uni-alpha/networker/kustomization.yaml new file mode 100644 index 000000000..b7ffc3f90 --- /dev/null +++ b/examples/dt/uni-alpha/networker/kustomization.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +components: + - ../../../../dt/uni-alpha/networker + +resources: + - values.yaml diff --git a/examples/dt/uni-alpha/networker/values.yaml b/examples/dt/uni-alpha/networker/values.yaml new file mode 100644 index 000000000..b63015787 --- /dev/null +++ b/examples/dt/uni-alpha/networker/values.yaml @@ -0,0 +1,134 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: edpm-networker-values + annotations: + config.kubernetes.io/local-config: "true" + +data: + ssh_keys: + authorized: CHANGEME + private: CHANGEME2 + public: CHANGEME3 + + nodeset: + ansible: + ansibleUser: cloud-admin + ansiblePort: 22 + ansibleVars: + timesync_ntp_servers: + - hostname: clock.redhat.com + + gather_facts: false + enable_debug: false + + edpm_nodes_validation_validate_controllers_icmp: false + edpm_nodes_validation_validate_gateway_icmp: false + + edpm_network_config_hide_sensitive_logs: false + edpm_network_config_os_net_config_mappings: + edpm-networker: + nic2: enp2s0 + + edpm_enable_chassis_gw: true + + edpm_sshd_configure_firewall: true + edpm_sshd_allowed_ranges: + - '192.168.122.0/24' + + edpm_network_config_template: | + --- + {% set mtu_list = [ctlplane_mtu] %} + {% for network in role_networks %} + {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {%- endfor %} + {% set min_viable_mtu = mtu_list | max %} + network_config: + - type: ovs_bridge + name: {{ neutron_physical_bridge_name }} + mtu: {{ min_viable_mtu }} + use_dhcp: false + dns_servers: {{ ctlplane_dns_nameservers }} + domain: {{ dns_search_domains }} + addresses: + - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} + routes: {{ ctlplane_host_routes }} + members: + - type: interface + name: nic1 + mtu: {{ min_viable_mtu }} + # force the MAC address of the bridge to this interface + primary: true + {% for network in role_networks %} + - type: vlan + mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} + vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} + addresses: + - ip_netmask: + {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} + routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} + {% endfor %} + + neutron_physical_bridge_name: br-ex + neutron_public_interface_name: eth0 + + registry_url: registry-proxy.engineering.redhat.com/rh-osbs + container_prefix: rhosp18-openstack + image_tag: 18.0 + + edpm_iscsid_image: '{{ registry_url }}/{{ container_prefix }}-iscsid:{{ image_tag }}' + edpm_logrotate_crond_image: '{{ registry_url }}/{{ container_prefix }}-cron:{{ image_tag }}' + edpm_neutron_metadata_agent_image: '{{ registry_url }}/{{ container_prefix }}-neutron-metadata-agent-ovn:{{ image_tag }}' + edpm_ovn_controller_agent_image: '{{ registry_url }}/{{ container_prefix }}-ovn-controller:{{ image_tag }}' + edpm_ovn_metadata_agent_image: '{{ registry_url }}/{{ container_prefix }}-neutron-metadata-agent-ovn:{{ image_tag }}' + + networks: + - defaultRoute: true + name: CtlPlane + subnetName: subnet1 + - name: InternalApi + subnetName: subnet1 + - name: Tenant + subnetName: subnet1 + + nodes: + edpm-networker-0: + hostName: edpm-networker-0 + ansible: + ansibleHost: 192.168.122.102 + networks: + - name: ctlplane + subnetName: subnet1 + defaultRoute: true + fixedIP: 192.168.122.102 + - name: internalapi + subnetName: subnet1 + - name: tenant + subnetName: subnet1 + edpm-networker-1: + hostName: edpm-networker-1 + ansible: + ansibleHost: 192.168.122.103 + networks: + - name: ctlplane + subnetName: subnet1 + defaultRoute: true + fixedIP: 192.168.122.103 + - name: internalapi + subnetName: subnet1 + - name: tenant + subnetName: subnet1 + + services: + - bootstrap + - download-cache + - configure-network + - validate-network + - install-os + - configure-os + - ssh-known-hosts + - run-os + - reboot-os + - install-certs + - ovn diff --git a/examples/dt/uni-alpha/values.yaml b/examples/dt/uni-alpha/values.yaml new file mode 100644 index 000000000..6454b7aac --- /dev/null +++ b/examples/dt/uni-alpha/values.yaml @@ -0,0 +1,154 @@ +--- +apiVersion: v1 +kind: ConfigMap + +metadata: + name: edpm-values + annotations: + config.kubernetes.io/local-config: "true" + +data: + ssh_keys: + authorized: _replaced_ + private: _replaced_ + public: _replaced_ + + nova: + migration: + ssh_keys: + private: _replaced_ + public: _replaced_ + + nodeset: + ansible: + ansibleUser: cloud-admin + ansiblePort: 22 + ansibleVars: + service_net_map: + nova_api_network: internalapi + nova_libvirt_network: internalapi + timesync_ntp_servers: + - hostname: clock.redhat.com + edpm_network_config_hide_sensitive_logs: false + edpm_network_config_template: | + --- + {% set mtu_list = [ctlplane_mtu] %} + {% for network in role_networks %} + {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {%- endfor %} + {% set min_viable_mtu = mtu_list | max %} + network_config: + - type: ovs_bridge + name: {{ neutron_physical_bridge_name }} + mtu: {{ min_viable_mtu }} + use_dhcp: false + dns_servers: {{ ctlplane_dns_nameservers }} + domain: {{ dns_search_domains }} + addresses: + - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} + routes: {{ ctlplane_host_routes }} + members: + - type: interface + name: nic2 + mtu: {{ min_viable_mtu }} + primary: true + {% for network in role_networks %} + - type: vlan + mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} + vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} + addresses: + - ip_netmask: + {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} + routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} + {% endfor %} + neutron_physical_bridge_name: br-ex + neutron_public_interface_name: eth0 + + edpm_nodes_validation_validate_controllers_icmp: false + edpm_nodes_validation_validate_gateway_icmp: false + + edpm_selinux_mode: enforcing + edpm_sshd_configure_firewall: true + edpm_sshd_allowed_ranges: + - 192.168.122.0/24 + + edpm_ovn_availability_zones: + - zone-1 + - zone-2 + + enable_debug: false + gather_facts: false + + image_tag: 18.0 + registry_url: registry-proxy.engineering.redhat.com/rh-osbs + container_prefix: rhosp18-openstack + + edpm_iscsid_image: '{{ registry_url }}/{{ container_prefix }}-iscsid:{{ image_tag }}' + edpm_logrotate_crond_image: '{{ registry_url }}/{{ container_prefix }}-cron:{{ image_tag }}' + edpm_neutron_metadata_agent_image: '{{ registry_url }}/{{ container_prefix }}-neutron-metadata-agent-ovn:{{ image_tag }}' + edpm_nova_compute_container_image: '{{ registry_url }}/{{ container_prefix }}-nova-compute:{{ image_tag }}' + edpm_nova_libvirt_container_image: '{{ registry_url }}/{{ container_prefix }}-nova-libvirt:{{ image_tag }}' + edpm_libvirt_image: '{{ registry_url }}/{{ container_prefix }}-nova-libvirt:{{ image_tag }}' + edpm_ovn_controller_agent_image: '{{ registry_url }}/{{ container_prefix }}-ovn-controller:{{ image_tag }}' + edpm_ovn_metadata_agent_image: '{{ registry_url }}/{{ container_prefix }}-neutron-metadata-agent-ovn:{{ image_tag }}' + + networks: + - defaultRoute: true + name: CtlPlane + subnetName: subnet1 + - name: InternalApi + subnetName: subnet1 + - name: Storage + subnetName: subnet1 + - name: Tenant + subnetName: subnet1 + + nodes: + edpm-compute-0: + ansible: + ansibleHost: 192.168.122.100 + hostName: edpm-compute-0 + networks: + - defaultRoute: true + fixedIP: 192.168.122.100 + name: ctlplane + subnetName: ctlplaneSubnet + - name: internalapi + subnetName: internalApiSubnet + - name: storage + subnetName: storageSubnet + - name: tenant + subnetName: tenantSubnet + + edpm-compute-1: + ansible: + ansibleHost: 192.168.122.101 + hostName: edpm-compute-1 + networks: + - defaultRoute: true + fixedIP: 192.168.122.101 + name: ctlplane + subnetName: ctlplaneSubnet + - name: internalapi + subnetName: internalApiSubnet + - name: storage + subnetName: storageSubnet + - name: tenant + subnetName: tenantSubnet + + services: + - bootstrap + - download-cache + - configure-network + - validate-network + - install-os + - configure-os + - ssh-known-hosts + - run-os + - reboot-os + - install-certs + - ovn + - neutron-metadata + - libvirt + - nova + - telemetry diff --git a/lib/control-plane/openstackcontrolplane.yaml b/lib/control-plane/openstackcontrolplane.yaml index b946d3619..f4e39b245 100644 --- a/lib/control-plane/openstackcontrolplane.yaml +++ b/lib/control-plane/openstackcontrolplane.yaml @@ -181,3 +181,27 @@ spec: ringReplicas: 1 swiftStorage: replicas: 1 + telemetry: + enabled: false + template: + metricStorage: + enabled: false + monitoringStack: + alertingEnabled: true + scrapeInterval: 30s + storage: + strategy: persistent + retention: 24h + persistent: + pvcStorageRequest: 20G + autoscaling: + enabled: false + aodh: + passwordSelectors: + databaseInstance: openstack + memcachedInstance: memcached + secret: osp-secret + heatInstance: heat + ceilometer: + enabled: false + secret: osp-secret