Skip to content

Yoga: merge xena #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 28, 2022
Merged

Yoga: merge xena #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9dcc4ec
Make prometheus datasource configurable.
jovial Oct 19, 2022
28122cd
Merge pull request #235 from stackhpc/sync/wallaby-into-xena-2022-11-17
jovial Nov 18, 2022
62b05b0
Add Ubuntu CI
markgoddard Aug 17, 2022
52487d2
Merge pull request #138 from stackhpc/ubuntu-ci
markgoddard Nov 22, 2022
6e4d042
Change default setting
Nov 23, 2022
863cd98
Merge pull request #243 from stackhpc/cinder-backup-default
markgoddard Nov 23, 2022
da05599
Merge pull request #245 from stackhpc/feature/xena/configurable-datas…
markgoddard Nov 24, 2022
1b3d801
Bump kayobe automation to fix issue with /src not existing
jovial Nov 25, 2022
c5fa564
Switch to using absolute limit for low memory alert (#247)
jovial Nov 28, 2022
7fb7f52
Merge pull request #250 from stackhpc/ci/wallaby/bump-automation
markgoddard Nov 28, 2022
c6c57ff
Merge stackhpc/wallaby into stackhpc/xena
markgoddard Nov 28, 2022
e72a850
Merge stackhpc/xena into stackhpc/yoga
markgoddard Nov 28, 2022
45dd43e
CI: Ubuntu images not available yet
markgoddard Nov 28, 2022
4f94494
Merge stackhpc/xena into stackhpc/yoga
markgoddard Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .automation
Open in desktop
Submodule .automation updated 3 files
+4 −0 ansible/roles/config-diff-vars/templates/kayobe-extra-vars.yml.j2
+3 −3 docker/kayobe/Dockerfile
+14 −0 utils/kayobe-automation-activate
2 changes: 2 additions & 0 deletions .github/workflows/stackhpc-all-in-one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jobs:
run: |
cat << EOF > terraform.tfvars
ssh_public_key = "id_rsa.pub"
ssh_username = "${{ env.SSH_USERNAME }}"
aio_vm_interface = "${{ env.VM_INTERFACE }}"
aio_vm_name = "${{ env.VM_NAME }}"
aio_vm_image = "${{ env.VM_IMAGE }}"
Expand All @@ -99,6 +100,7 @@ jobs:
EOF
working-directory: ${{ github.workspace }}/terraform/aio
env:
SSH_USERNAME: "${{ inputs.os_distribution == 'ubuntu' && 'ubuntu' || 'cloud-user' }}"
VM_NAME: "skc-ci-aio-${{ inputs.neutron_plugin }}-${{ github.run_id }}"
VM_IMAGE: ${{ inputs.vm_image }}
VM_FLAVOR: ${{ inputs.vm_flavor }}
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/stackhpc-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,33 @@ jobs:
OS_CLOUD: sms-lab-release
secrets: inherit
if: github.repository == 'stackhpc/stackhpc-kayobe-config'

all-in-one-ubuntu-ovs:
name: aio (Ubuntu OVS)
needs:
- build-kayobe-image
uses: ./.github/workflows/stackhpc-all-in-one.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
os_distribution: ubuntu
neutron_plugin: ovs
vm_image: Ubuntu-20.04
OS_CLOUD: sms-lab-release
secrets: inherit
# NOTE: Ubuntu images not available yet.
if: false && github.repository == 'stackhpc/stackhpc-kayobe-config'

all-in-one-ubuntu-ovn:
name: aio (Ubuntu OVN)
needs:
- build-kayobe-image
uses: ./.github/workflows/stackhpc-all-in-one.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
os_distribution: ubuntu
neutron_plugin: ovn
vm_image: Ubuntu-20.04
OS_CLOUD: sms-lab-release
secrets: inherit
# NOTE: Ubuntu images not available yet.
if: false && github.repository == 'stackhpc/stackhpc-kayobe-config'
2 changes: 1 addition & 1 deletion etc/kayobe/cephadm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ kolla_ceph_services:
kolla_ceph_cinder_volume_required: "{{ kolla_enable_cinder | bool }}"

# Whether to generate Ceph configuration for Cinder backup.
kolla_ceph_cinder_backup_required: "{{ kolla_enable_cinder_backup | default(false) | bool }}"
kolla_ceph_cinder_backup_required: "{{ kolla_enable_cinder_backup | default(true) | bool }}"

# Whether to generate Ceph configuration for Glance.
kolla_ceph_glance_required: "{{ kolla_enable_glance | bool }}"
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_mds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
},
"hide": 0,
"includeAll": false,
"label": "Data Source",
"label": "datasource",
"multi": false,
"name": "datasource",
"options": [],
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_osds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@
},
"hide": 0,
"includeAll": false,
"label": "Data Source",
"label": "datasource",
"multi": false,
"name": "datasource",
"options": [],
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2787,7 +2787,7 @@
},
"hide": 0,
"includeAll": false,
"label": "Data Source",
"label": "datasource",
"multi": false,
"name": "datasource",
"options": [],
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/kolla/config/grafana/dashboards/ceph/ceph_pools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@
},
"hide": 0,
"includeAll": false,
"label": "Data Source",
"label": "datasource",
"multi": false,
"name": "datasource",
"options": [],
Expand Down
42 changes: 31 additions & 11 deletions etc/kayobe/kolla/config/grafana/dashboards/openstack/blackbox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"dashes": false,
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fill": 1,
"fillGradient": 0,
Expand Down Expand Up @@ -129,7 +129,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -223,7 +223,7 @@
"dashes": false,
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fill": 1,
"fillGradient": 0,
Expand Down Expand Up @@ -307,7 +307,7 @@
"dashes": false,
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fill": 1,
"fillGradient": 0,
Expand Down Expand Up @@ -387,7 +387,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -478,7 +478,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -551,7 +551,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -641,7 +641,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -732,7 +732,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -806,7 +806,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -888,6 +888,26 @@
],
"templating": {
"list": [
{
"current": {
"selected": false,
"text": "Prometheus",
"value": "Prometheus"
},
"description": "The prometheus datasource used for queries.",
"hide": 0,
"includeAll": false,
"label": "datasource",
"multi": false,
"name": "datasource",
"options": [],
"query": "prometheus",
"queryValue": "",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"type": "datasource"
},
{
"auto": true,
"auto_count": 10,
Expand Down Expand Up @@ -989,7 +1009,7 @@
},
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${datasource}"
},
"definition": "",
"hide": 0,
Expand Down
Loading