From e1be8ccd3a5fef4d5e667ac5c97bf09dfe2b2888 Mon Sep 17 00:00:00 2001 From: Nobuto Murata Date: Mon, 9 Mar 2020 11:44:33 +0900 Subject: [PATCH 1/3] Tidy up the placement charm * use explicit relation names * use the official charm name space * fix annotations since it hid the nova-c-c icon in Juju GUI --- .../openstack-base-bionic-train/bundle.yaml | 14 +++++++------- .../bundle.yaml | 10 +++++----- .../bundle.yaml | 10 +++++----- .../openstack-base-eoan-train/bundle.yaml | 14 +++++++------- .../openstack-telemetry-bionic-train/bundle.yaml | 14 +++++++------- .../openstack-telemetry-eoan-train/bundle.yaml | 14 +++++++------- stable/openstack-base/bundle.yaml | 16 ++++++++-------- stable/openstack-telemetry/bundle.yaml | 16 ++++++++-------- .../overlays/openstack-base-spaces-overlay.yaml | 3 +++ 9 files changed, 57 insertions(+), 54 deletions(-) diff --git a/development/openstack-base-bionic-train/bundle.yaml b/development/openstack-base-bionic-train/bundle.yaml index fc6d0980..9eb6b47e 100644 --- a/development/openstack-base-bionic-train/bundle.yaml +++ b/development/openstack-base-bionic-train/bundle.yaml @@ -92,12 +92,12 @@ relations: - ceph-mon:radosgw - - ceph-radosgw:identity-service - keystone:identity-service -- - placement - - mysql -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:shared-db + - mysql:shared-db +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement series: bionic services: ceph-mon: @@ -205,7 +205,7 @@ services: - 'lxd:1' placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' charm: cs:~openstack-charmers-next/bionic/placement num_units: 1 diff --git a/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml b/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml index 72ed29c2..9695fc1f 100644 --- a/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml +++ b/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml @@ -75,10 +75,10 @@ relations: - ceph-mon:radosgw - - ceph-radosgw:identity-service - keystone:identity-service -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement - ["keystone:shared-db", "percona-cluster:shared-db"] - ["cinder:shared-db", "percona-cluster:shared-db"] - ["glance:shared-db", "percona-cluster:shared-db"] @@ -218,7 +218,7 @@ applications: - 'lxd:1' placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml b/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml index 9d42553d..8ed7d9ef 100644 --- a/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml +++ b/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml @@ -75,10 +75,10 @@ relations: - ceph-mon:radosgw - - ceph-radosgw:identity-service - keystone:identity-service -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement - ["keystone:shared-db", "keystone-mysql-router:shared-db"] - ["cinder:shared-db", "cinder-mysql-router:shared-db"] - ["glance:shared-db", "glance-mysql-router:shared-db"] @@ -218,7 +218,7 @@ applications: - 'lxd:1' placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/development/openstack-base-eoan-train/bundle.yaml b/development/openstack-base-eoan-train/bundle.yaml index b28c6806..34672961 100644 --- a/development/openstack-base-eoan-train/bundle.yaml +++ b/development/openstack-base-eoan-train/bundle.yaml @@ -92,12 +92,12 @@ relations: - ceph-mon:radosgw - - ceph-radosgw:identity-service - keystone:identity-service -- - placement - - mysql -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:shared-db + - mysql:shared-db +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement series: eoan services: ceph-mon: @@ -205,7 +205,7 @@ services: - 'lxd:1' placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/development/openstack-telemetry-bionic-train/bundle.yaml b/development/openstack-telemetry-bionic-train/bundle.yaml index 6c111313..030a1bae 100644 --- a/development/openstack-telemetry-bionic-train/bundle.yaml +++ b/development/openstack-telemetry-bionic-train/bundle.yaml @@ -120,12 +120,12 @@ relations: - keystone:identity-service - - ceilometer:identity-credentials - keystone:identity-credentials -- - placement - - mysql -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:shared-db + - mysql:shared-db +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement series: bionic services: aodh: @@ -245,7 +245,7 @@ services: - 'lxd:0' placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' charm: cs:~openstack-charmers-next/bionic/placement num_units: 1 diff --git a/development/openstack-telemetry-eoan-train/bundle.yaml b/development/openstack-telemetry-eoan-train/bundle.yaml index a9f12c17..f2f14d3b 100644 --- a/development/openstack-telemetry-eoan-train/bundle.yaml +++ b/development/openstack-telemetry-eoan-train/bundle.yaml @@ -120,12 +120,12 @@ relations: - keystone:identity-service - - ceilometer:identity-credentials - keystone:identity-credentials -- - placement - - mysql -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:shared-db + - mysql:shared-db +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement series: eoan services: aodh: @@ -245,7 +245,7 @@ services: - 'lxd:0' placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/stable/openstack-base/bundle.yaml b/stable/openstack-base/bundle.yaml index e306126c..2be6b7d0 100644 --- a/stable/openstack-base/bundle.yaml +++ b/stable/openstack-base/bundle.yaml @@ -84,12 +84,12 @@ relations: - ceph-mon:radosgw - - ceph-radosgw:identity-service - keystone:identity-service -- - placement - - mysql -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:shared-db + - mysql:shared-db +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement series: bionic services: ceph-mon: @@ -262,9 +262,9 @@ services: - lxd:3 placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' - charm: cs:~openstack-charmers/bionic/placement + charm: cs:placement-4 num_units: 1 options: openstack-origin: cloud:bionic-train diff --git a/stable/openstack-telemetry/bundle.yaml b/stable/openstack-telemetry/bundle.yaml index 0c810c61..04020ca6 100644 --- a/stable/openstack-telemetry/bundle.yaml +++ b/stable/openstack-telemetry/bundle.yaml @@ -112,12 +112,12 @@ relations: - keystone:identity-service - - ceilometer:identity-credentials - keystone:identity-credentials -- - placement - - mysql -- - placement - - keystone -- - placement - - nova-cloud-controller +- - placement:shared-db + - mysql:shared-db +- - placement:identity-service + - keystone:identity-service +- - placement:placement + - nova-cloud-controller:placement series: bionic services: aodh: @@ -333,9 +333,9 @@ services: - lxd:3 placement: annotations: - gui-x: '0' + gui-x: '-250' gui-y: '500' - charm: cs:~openstack-charmers/bionic/placement + charm: cs:placement-4 num_units: 1 options: openstack-origin: cloud:bionic-train diff --git a/stable/overlays/openstack-base-spaces-overlay.yaml b/stable/overlays/openstack-base-spaces-overlay.yaml index 7238f803..3f811ef5 100644 --- a/stable/overlays/openstack-base-spaces-overlay.yaml +++ b/stable/overlays/openstack-base-spaces-overlay.yaml @@ -34,6 +34,9 @@ applications: openstack-dashboard: bindings: "": *public-space + placement: + bindings: + "": *public-space rabbitmq-server: bindings: "": *public-space From e68099d68ad9f8beb34ea822335ed0d5fff6bd74 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 1 Feb 2021 14:40:52 +0100 Subject: [PATCH 2/3] Fix merge conflict --- stable/openstack-base/bundle.yaml | 6 ------ stable/openstack-telemetry/bundle.yaml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/stable/openstack-base/bundle.yaml b/stable/openstack-base/bundle.yaml index 3f664248..c080cb99 100644 --- a/stable/openstack-base/bundle.yaml +++ b/stable/openstack-base/bundle.yaml @@ -323,15 +323,9 @@ applications: - lxd:1 rabbitmq-server: annotations: -<<<<<<< HEAD - gui-x: '-250' - gui-y: '500' - charm: cs:placement-4 -======= gui-x: '300' gui-y: '1550' charm: cs:rabbitmq-server-106 ->>>>>>> master num_units: 1 to: - lxd:2 diff --git a/stable/openstack-telemetry/bundle.yaml b/stable/openstack-telemetry/bundle.yaml index a0d9a408..f0e95851 100644 --- a/stable/openstack-telemetry/bundle.yaml +++ b/stable/openstack-telemetry/bundle.yaml @@ -384,15 +384,9 @@ relations: - lxd:1 rabbitmq-server: annotations: -<<<<<<< HEAD - gui-x: '-250' - gui-y: '500' - charm: cs:placement-4 -======= gui-x: '300' gui-y: '1550' charm: cs:rabbitmq-server-106 ->>>>>>> master num_units: 1 to: - lxd:2 From 8c24945a451681c3f96ba57854e332ed62104c70 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 1 Feb 2021 14:49:06 +0100 Subject: [PATCH 3/3] Revert unneeded/wrong changes --- development/openstack-base-bionic-train/bundle.yaml | 2 +- .../openstack-base-eoan-train-mysql8-migration/bundle.yaml | 2 +- development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml | 2 +- development/openstack-base-eoan-train/bundle.yaml | 2 +- development/openstack-telemetry-bionic-train/bundle.yaml | 2 +- development/openstack-telemetry-eoan-train/bundle.yaml | 2 +- stable/openstack-telemetry/bundle.yaml | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/development/openstack-base-bionic-train/bundle.yaml b/development/openstack-base-bionic-train/bundle.yaml index 9eb6b47e..54c2c703 100644 --- a/development/openstack-base-bionic-train/bundle.yaml +++ b/development/openstack-base-bionic-train/bundle.yaml @@ -205,7 +205,7 @@ services: - 'lxd:1' placement: annotations: - gui-x: '-250' + gui-x: '0' gui-y: '500' charm: cs:~openstack-charmers-next/bionic/placement num_units: 1 diff --git a/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml b/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml index 9695fc1f..099c1daf 100644 --- a/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml +++ b/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml @@ -218,7 +218,7 @@ applications: - 'lxd:1' placement: annotations: - gui-x: '-250' + gui-x: '0' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml b/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml index b65f8eb1..caf3c435 100644 --- a/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml +++ b/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml @@ -242,7 +242,7 @@ applications: charm: cs:~openstack-charmers-next/mysql-router placement: annotations: - gui-x: '-250' + gui-x: '0' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/development/openstack-base-eoan-train/bundle.yaml b/development/openstack-base-eoan-train/bundle.yaml index 34672961..a45aff25 100644 --- a/development/openstack-base-eoan-train/bundle.yaml +++ b/development/openstack-base-eoan-train/bundle.yaml @@ -205,7 +205,7 @@ services: - 'lxd:1' placement: annotations: - gui-x: '-250' + gui-x: '0' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/development/openstack-telemetry-bionic-train/bundle.yaml b/development/openstack-telemetry-bionic-train/bundle.yaml index 030a1bae..a0c9a58f 100644 --- a/development/openstack-telemetry-bionic-train/bundle.yaml +++ b/development/openstack-telemetry-bionic-train/bundle.yaml @@ -245,7 +245,7 @@ services: - 'lxd:0' placement: annotations: - gui-x: '-250' + gui-x: '0' gui-y: '500' charm: cs:~openstack-charmers-next/bionic/placement num_units: 1 diff --git a/development/openstack-telemetry-eoan-train/bundle.yaml b/development/openstack-telemetry-eoan-train/bundle.yaml index f2f14d3b..976ba725 100644 --- a/development/openstack-telemetry-eoan-train/bundle.yaml +++ b/development/openstack-telemetry-eoan-train/bundle.yaml @@ -245,7 +245,7 @@ services: - 'lxd:0' placement: annotations: - gui-x: '-250' + gui-x: '0' gui-y: '500' charm: cs:~openstack-charmers-next/eoan/placement num_units: 1 diff --git a/stable/openstack-telemetry/bundle.yaml b/stable/openstack-telemetry/bundle.yaml index f0e95851..85b65b45 100644 --- a/stable/openstack-telemetry/bundle.yaml +++ b/stable/openstack-telemetry/bundle.yaml @@ -168,6 +168,7 @@ relations: - ceilometer:metric-service - - gnocchi:identity-service - keystone:identity-service +applications: aodh: annotations: gui-x: '1500'