diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/ceph-rgw-static-overrides.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/ceph-rgw-static-overrides.yaml new file mode 100644 index 00000000..ccb78868 --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/ceph-rgw-static-overrides.yaml @@ -0,0 +1,63 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +release_group: osh-openstack-ceph-rgw +conf: + ceph: + global: + cephx: false + rgw_ks: + enabled: true +endpoints: + object_store: + path: + default: '/swift/v1' + port: + api: + default: null + admin: 7480 + internal: 7480 + public: 7480 +images: + tags: + ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 + ceph_rgw: null + image_repo_sync: null + ceph_bootstrap: null + ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest + ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest + ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest + rgw_placement_targets: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 + rgw_s3_admin: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 +labels: + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + registry: + node_selector_key: openstack-control-plane + node_selector_value: enabled +pod: + replicas: + api: 2 + registry: 2 + affinity: + anti: + type: + default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + rgw: + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/ceph-rgw-system-overrides.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/ceph-rgw-system-overrides.yaml new file mode 100644 index 00000000..e69de29b diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/helmrelease.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/helmrelease.yaml new file mode 100644 index 00000000..dd48bdce --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/helmrelease.yaml @@ -0,0 +1,41 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +apiVersion: "helm.toolkit.fluxcd.io/v2beta1" +kind: HelmRelease +metadata: + name: ceph-rgw + labels: + chart_group: openstack-ceph-rgw +spec: + releaseName: osh-openstack-ceph-rgw + chart: + spec: + chart: ceph-rgw + version: 0.1.15 + sourceRef: + kind: HelmRepository + name: starlingx + interval: 5m + timeout: 5m + test: + enable: false + install: + disableHooks: false + upgrade: + disableHooks: false + dependsOn: + - name: cinder + namespace: openstack + valuesFrom: + - kind: Secret + name: ceph-rgw-static-overrides + valuesKey: ceph-rgw-static-overrides.yaml + - kind: Secret + name: ceph-rgw-system-overrides + valuesKey: ceph-rgw-system-overrides.yaml +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/kustomization.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/kustomization.yaml new file mode 100644 index 00000000..e64c734d --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/kustomization.yaml @@ -0,0 +1,20 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +namespace: openstack +resources: + - helmrelease.yaml +secretGenerator: + - name: ceph-rgw-static-overrides + files: + - ceph-rgw-static-overrides.yaml + - name: ceph-rgw-system-overrides + files: + - ceph-rgw-system-overrides.yaml +generatorOptions: + disableNameSuffixHash: true +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/cinder-static-overrides.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/cinder-static-overrides.yaml new file mode 100644 index 00000000..1e681b05 --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/cinder-static-overrides.yaml @@ -0,0 +1,80 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +release_group: osh-openstack-cinder +labels: + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + backup: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + scheduler: + node_selector_key: openstack-control-plane + node_selector_value: enabled + volume: + node_selector_key: openstack-control-plane + node_selector_value: enabled +images: + tags: + bootstrap: docker.io/starlingx/stx-heat:master-centos-stable-latest + cinder_api: docker.io/starlingx/stx-cinder:master-centos-stable-latest + cinder_backup: docker.io/starlingx/stx-cinder:master-centos-stable-latest + cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 + cinder_db_sync: docker.io/starlingx/stx-cinder:master-centos-stable-latest + cinder_scheduler: docker.io/starlingx/stx-cinder:master-centos-stable-latest + cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 + cinder_volume: docker.io/starlingx/stx-cinder:master-centos-stable-latest + cinder_volume_usage_audit: docker.io/starlingx/stx-cinder:master-centos-stable-latest + db_drop: docker.io/starlingx/stx-heat:master-centos-stable-latest + db_init: docker.io/starlingx/stx-heat:master-centos-stable-latest + image_repo_sync: null + ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest + ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest + ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest + test: null +pod: + replicas: + api: 2 + volume: 1 + scheduler: 1 + backup: 1 + affinity: + anti: + type: + default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + cinder: + enabled: true + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule +endpoints: + oslo_messaging: + statefulset: + name: osh-openstack-rabbitmq-rabbitmq + identity: + force_public_endpoint: true +conf: + cinder: + DEFAULT: + backup_driver: cinder.backup.drivers.ceph.CephBackupDriver + osapi_volume_listen: "::" + glance_api_servers: http://glance.openstack.svc.cluster.local:80/ + keystone_authtoken: + interface: internal + auth_uri: http://keystone.openstack.svc.cluster.local:80/v3 + auth_url: http://keystone.openstack.svc.cluster.local:80/v3 +storage: rbd +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/cinder-system-overrides.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/cinder-system-overrides.yaml new file mode 100644 index 00000000..e69de29b diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/helmrelease.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/helmrelease.yaml new file mode 100644 index 00000000..86163b45 --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/helmrelease.yaml @@ -0,0 +1,41 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +apiVersion: "helm.toolkit.fluxcd.io/v2beta1" +kind: HelmRelease +metadata: + name: cinder + labels: + chart_group: openstack-cinder +spec: + releaseName: osh-openstack-cinder + chart: + spec: + chart: cinder + version: 0.2.10 + sourceRef: + kind: HelmRepository + name: starlingx + interval: 5m + timeout: 30m + test: + enable: false + install: + disableHooks: false + upgrade: + disableHooks: false + dependsOn: + - name: glance + namespace: openstack + valuesFrom: + - kind: Secret + name: cinder-static-overrides + valuesKey: cinder-static-overrides.yaml + - kind: Secret + name: cinder-system-overrides + valuesKey: cinder-system-overrides.yaml +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/kustomization.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/kustomization.yaml new file mode 100644 index 00000000..1ffe850e --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/cinder/kustomization.yaml @@ -0,0 +1,20 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +namespace: openstack +resources: + - helmrelease.yaml +secretGenerator: + - name: cinder-static-overrides + files: + - cinder-static-overrides.yaml + - name: cinder-system-overrides + files: + - cinder-system-overrides.yaml +generatorOptions: + disableNameSuffixHash: true +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/glance-static-overrides.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/glance-static-overrides.yaml new file mode 100644 index 00000000..77baa429 --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/glance-static-overrides.yaml @@ -0,0 +1,91 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +release_group: osh-openstack-glance +labels: + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + registry: + node_selector_key: openstack-control-plane + node_selector_value: enabled +images: + tags: + bootstrap: docker.io/starlingx/stx-heat:master-centos-stable-latest + db_drop: docker.io/starlingx/stx-heat:master-centos-stable-latest + db_init: docker.io/starlingx/stx-heat:master-centos-stable-latest + glance_api: docker.io/starlingx/stx-glance:master-centos-stable-latest + glance_db_sync: docker.io/starlingx/stx-glance:master-centos-stable-latest + glance_registry: docker.io/starlingx/stx-glance:master-centos-stable-latest + glance_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 + image_repo_sync: null + ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest + ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest + ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest + test: null + glance_metadefs_load: docker.io/starlingx/stx-glance:master-centos-stable-latest +pod: + replicas: + api: 2 + registry: 2 + affinity: + anti: + type: + default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + glance: + enabled: true + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule +endpoints: + oslo_messaging: + statefulset: + name: osh-openstack-rabbitmq-rabbitmq + identity: + force_public_endpoint: true +conf: + extra_metadata: + pci_irq_affinity: + description: "This provides the possibility to set custom PCI IRQ Affinity configuration for instances with dedicated vCPUs." + display_name: PCI IRQ Affinity + namespace: OS::Compute::PCIIRQAffinity + properties: + pci_irq_affinity_mask: + description: "Determines which vCPUs assigned to the instance must handle the interrupts from the PCI devices. The expected mask is a comma-separated list of values that can be expressed as: a single vCPU index (int), a closed interval of vCPU indexes (int1-int2), and a negation expressing that the vCPU index will not be assigned (^int). Note: int must be an integer between 0 and flavor.vcpus - 1. Example: 0-3,^2,6 means that vCPUs with indexes 0,1,3 and 6 will be assigned." + title: PCI IRQ Affinity Mask + type: string + protected: true + resource_type_associations: + - name: OS::Nova::Flavor + prefix: 'hw:' + - name: OS::Glance::Image + prefix: 'hw_' + - name: OS::Cinder::Volume + prefix: 'hw_' + properties_target: image + visibility: public + glance: + DEFAULT: + bind_host: "::" + registry_host: glance-reg.openstack.svc.cluster.local + registry_port: 80 + keystone_authtoken: + auth_uri: http://keystone.openstack.svc.cluster.local:80/v3 + auth_url: http://keystone.openstack.svc.cluster.local:80/v3 + glance_registry: + keystone_authtoken: + auth_uri: http://keystone.openstack.svc.cluster.local:80/v3 + auth_url: http://keystone.openstack.svc.cluster.local:80/v3 +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/glance-system-overrides.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/glance-system-overrides.yaml new file mode 100644 index 00000000..e69de29b diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/helmrelease.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/helmrelease.yaml new file mode 100644 index 00000000..8ed6d840 --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/helmrelease.yaml @@ -0,0 +1,41 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +apiVersion: "helm.toolkit.fluxcd.io/v2beta1" +kind: HelmRelease +metadata: + name: glance + labels: + chart_group: openstack-glance +spec: + releaseName: osh-openstack-glance + chart: + spec: + chart: glance + version: 0.2.9 + sourceRef: + kind: HelmRepository + name: starlingx + interval: 5m + timeout: 30m + test: + enable: false + install: + disableHooks: false + upgrade: + disableHooks: false + dependsOn: + - name: keystone + namespace: openstack + valuesFrom: + - kind: Secret + name: glance-static-overrides + valuesKey: glance-static-overrides.yaml + - kind: Secret + name: glance-system-overrides + valuesKey: glance-system-overrides.yaml +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/kustomization.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/kustomization.yaml new file mode 100644 index 00000000..f59c32e2 --- /dev/null +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/glance/kustomization.yaml @@ -0,0 +1,20 @@ +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +namespace: openstack +resources: + - helmrelease.yaml +secretGenerator: + - name: glance-static-overrides + files: + - glance-static-overrides.yaml + - name: glance-system-overrides + files: + - glance-system-overrides.yaml +generatorOptions: + disableNameSuffixHash: true +... diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/kustomization.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/kustomization.yaml index 33df18bb..1012a158 100644 --- a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/kustomization.yaml +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/kustomization.yaml @@ -20,4 +20,7 @@ resources: - barbican - keystone - keystone-api-proxy + - glance + - cinder + - ceph-rgw ...