canonical/cpe-deployments
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update bundles/overlays and model default

Browse Source 
* Update constraints to make sure that units go to the right machine
* Fix source for mysql-router apps
* http for install_source for telegraf
* Update some snap lxd stuff to ensure that works
* Some bionic changes
This commit is contained in:
Arif Ali 2021-12-02 10:16:35 +00:00
parent 23517e1a62
commit 47712cd3de
3 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
config/bundle_focal.yaml
View File

@ -133,32 +133,35 @@ machines:
# Baremetals
# Control Nodes
"100":
constraints: tags=control
constraints: tags=control,asrock01
"101":
constraints: tags=control
constraints: tags=control,asrock02
"102":
constraints: tags=control
constraints: tags=control,asrock03
# LMA Nodes
"200":
constraints: tags=compute
constraints: tags=compute,asrock01
"201":
constraints: tags=compute
constraints: tags=compute,asrock02
"202":
constraints: tags=compute
constraints: tags=compute,asrock03
# Landscape Nodes
"300":
constraints: tags=compute
constraints: tags=compute,asrock01
series: bionic
"301":
constraints: tags=compute
constraints: tags=compute,asrock02
series: bionic
"302":
constraints: tags=compute
constraints: tags=compute,asrock03
series: bionic
# Contrail Nodes
"400":
constraints: tags=control
constraints: tags=control,asrock01
"401":
constraints: tags=control
constraints: tags=control,asrock02
"402":
constraints: tags=control
constraints: tags=control,asrock03
# "500":
# constraints: tags=compute
# "501":
@ -514,7 +517,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
keystone-mysql-router:
charm: cs:mysql-router
bindings:
@ -522,7 +525,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
cinder-mysql-router:
charm: cs:mysql-router
bindings:
@ -530,7 +533,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
glance-mysql-router:
charm: cs:mysql-router
bindings:
@ -538,7 +541,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
gnocchi-mysql-router:
charm: cs:mysql-router
bindings:
@ -546,7 +549,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
heat-mysql-router:
charm: cs:mysql-router
bindings:
@ -554,7 +557,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
nova-cloud-controller-mysql-router:
charm: cs:mysql-router
bindings:
@ -562,7 +565,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
neutron-api-mysql-router:
charm: cs:mysql-router
bindings:
@ -570,7 +573,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
openstack-dashboard-mysql-router:
charm: cs:mysql-router
bindings:
@ -578,7 +581,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
placement-mysql-router:
charm: cs:mysql-router
bindings:
@ -586,7 +589,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
vault-mysql-router:
charm: cs:mysql-router
bindings:
@ -594,7 +597,7 @@ applications:
shared-db: *internal-space
db-router: *internal-space
options:
openstack-origin: *openstack-origin
source: *openstack-origin
neutron-api:
charm: cs:neutron-api
@ -876,7 +879,6 @@ applications:
- lxd:302
graylog:
charm: cs:graylog
series: bionic
bindings:
"": *oam-space
num_units: 1
@ -971,7 +973,7 @@ applications:
=92oX
-----END PGP PUBLIC KEY BLOCK-----
install_sources: |
- 'deb https://192.168.1.12/artifacts.elastic.co/packages/5.x/apt stable main'
- 'deb http://192.168.1.12/artifacts.elastic.co/packages/5.x/apt stable main'
nagios:
charm: cs:nagios
series: bionic

6
config/juju-model-default-cis-focal.yaml
View File

@ -49,7 +49,7 @@ cloudinit-userdata: |
remote_log_server=
# SSH access limitation parameters at /etc/ssh/sshd_config (CIS rule 5.2.14)
AllowUsers=ubuntu
AllowUsers=ubuntu nova
AllowGroups=
DenyUsers=
DenyGroups=
@ -92,6 +92,10 @@ cloudinit-userdata: |
- "! systemd-detect-virt --container && mv /root/99-post-juju.yaml /etc/netplan/99-post-juju.yaml"
- "! systemd-detect-virt --container && sudo lxc profile set default security.nesting true"
- sudo netplan apply
snap:
commands:
"00": systemctl restart snapd
default-series: "focal"
apt-mirror: http://192.168.1.12/archive.ubuntu.com/ubuntu
lxd-snap-channel: 4.19/stable

5
config/overlays/ldap.yaml
View File

@ -3,14 +3,16 @@
applications:
ldap-domain1:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
series: bionic
bindings:
"": oam
num_units: 1
to:
- lxd:100
ldap-domain2:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
series: bionic
bindings:
"": oam
to:
@ -18,6 +20,7 @@ applications:
ldap-domain3:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
series: bionic
bindings:
"": oam
to: