Update to latest code
* Add new policies * start migrating to CH * Add asrock04 to the mix
This commit is contained in:
parent
1e56ae1ff6
commit
daeaf78436
GPG Key ID:
369608FBA1353A70
@ -140,7 +140,7 @@ machines:
|
||||
"102":
|
||||
constraints: tags=control,asrock03
|
||||
"103":
|
||||
constraints: tags=compute,asrock01
|
||||
constraints: tags=compute,asrock04
|
||||
"104":
|
||||
constraints: tags=compute,asrock02
|
||||
"105":
|
||||
@ -149,18 +149,18 @@ machines:
|
||||
"200":
|
||||
constraints: tags=control,asrock01
|
||||
"201":
|
||||
constraints: tags=control,asrock02
|
||||
constraints: tags=control,asrock04
|
||||
"202":
|
||||
constraints: tags=control,asrock03
|
||||
constraints: tags=control,asrock02
|
||||
# Landscape Nodes
|
||||
"300":
|
||||
constraints: tags=compute,asrock01
|
||||
constraints: tags=compute,asrock04
|
||||
series: bionic
|
||||
"301":
|
||||
constraints: tags=compute,asrock02
|
||||
constraints: tags=compute,asrock03
|
||||
series: bionic
|
||||
"302":
|
||||
constraints: tags=compute,asrock03
|
||||
constraints: tags=compute,asrock01
|
||||
series: bionic
|
||||
# Contrail Nodes
|
||||
"400":
|
||||
@ -182,6 +182,10 @@ machines:
|
||||
constraints: tags=compute,asrock03
|
||||
"1005":
|
||||
constraints: tags=compute,asrock03
|
||||
"1006":
|
||||
constraints: tags=compute,asrock04
|
||||
"1007":
|
||||
constraints: tags=compute,asrock04
|
||||
|
||||
applications:
|
||||
# HAcluster
|
||||
@ -274,7 +278,7 @@ applications:
|
||||
# - lxd:102
|
||||
ceph-osd:
|
||||
charm: cs:ceph-osd
|
||||
num_units: 6
|
||||
num_units: 8
|
||||
bindings:
|
||||
"": *oam-space
|
||||
public: *ceph-public-space
|
||||
@ -297,6 +301,8 @@ applications:
|
||||
- '1003'
|
||||
- '1004'
|
||||
- '1005'
|
||||
- '1006'
|
||||
- '1007'
|
||||
# ceph-osd2:
|
||||
# charm: cs:ceph-osd
|
||||
# num_units: 6
|
||||
@ -715,7 +721,7 @@ applications:
|
||||
|
||||
nova-compute:
|
||||
charm: cs:nova-compute
|
||||
num_units: 6
|
||||
num_units: 8
|
||||
bindings:
|
||||
"": *oam-space
|
||||
internal: *internal-space
|
||||
@ -740,6 +746,8 @@ applications:
|
||||
- 1003
|
||||
- 1004
|
||||
- 1005
|
||||
- 1006
|
||||
- 1007
|
||||
ntp:
|
||||
charm: cs:ntp
|
||||
options:
|
||||
|
||||
@ -2,6 +2,9 @@
|
||||
|
||||
series=focal
|
||||
|
||||
juju add-model cpe-focal
|
||||
juju switch cpe-focal
|
||||
|
||||
juju model-config ./juju-model-default.yaml
|
||||
|
||||
juju model-config default-series=${series}
|
||||
@ -17,14 +20,12 @@ juju deploy ./bundle_${series}.yaml \
|
||||
|
||||
# --overlay ./overlays/lma_offers.yaml \
|
||||
# --overlay ./overlays/advanced-routing.yaml \
|
||||
# --overlay ./overlays/lma.yaml \
|
||||
# --overlay ./overlays/landscape.yaml \
|
||||
# --overlay ./overlays/ssl.yaml \
|
||||
# --overlay ./overlays/ssl_${series}.yaml \
|
||||
# --overlay ./overlays/lma.yaml \
|
||||
|
||||
# --overlay ./overlays/contrail.yaml \
|
||||
# --overlay ./overlays/openstack_versioned_overlay.yaml \
|
||||
# --overlay ./overlays/openstack_versioned_overlay_gemini.yaml \
|
||||
# --overlay ./overlays/contrail_versioned_overlay.yaml \
|
||||
# --overlay ./overlays/ssl.yaml \
|
||||
# --overlay ./overlays/contrail.yaml \
|
||||
|
||||
@ -1,36 +1,53 @@
|
||||
variables:
|
||||
charm-series: &charm-series focal
|
||||
charm-arch: &charm-arch amd64
|
||||
charm-series: &charm-series focal
|
||||
charm-arch: &charm-arch amd64
|
||||
mysql-channel: &mysql-channel "8.0/stable"
|
||||
os-channel: &os-channel "ussuri/stable"
|
||||
ceph-channel: &ceph-channel "octopus/stable"
|
||||
ha-channel: &hacluster-channel "2.0.3/stable"
|
||||
rmq-channel: &rmq-channel "3.8/stable"
|
||||
|
||||
applications:
|
||||
aodh:
|
||||
charm: cs:aodh-48
|
||||
charm: aodh
|
||||
channel: *os-channel
|
||||
# bcache-tuning:
|
||||
# charm: cs:bcache-tuning-6
|
||||
# canonical-livepatch:
|
||||
# charm: cs:canonical-livepatch-42
|
||||
ceilometer:
|
||||
charm: cs:ceilometer-282
|
||||
charm: ceilometer
|
||||
channel: *os-channel
|
||||
ceilometer-agent:
|
||||
charm: cs:ceilometer-agent-271
|
||||
charm: ceilometer-agent
|
||||
channel: *os-channel
|
||||
ceph-mon:
|
||||
charm: cs:ceph-mon-55
|
||||
charm: ceph-mon
|
||||
channel: *ceph-channel
|
||||
ceph-osd:
|
||||
charm: cs:ceph-osd-310
|
||||
charm: ceph-osd
|
||||
channel: *ceph-channel
|
||||
# ceph-osd2:
|
||||
# charm: cs:ceph-osd-310
|
||||
# charm: ceph-osd
|
||||
# channel: *ceph-channel
|
||||
# ceph-radosgw:
|
||||
# charm: cs:ceph-radosgw-296
|
||||
# charm: ceph-radosgw
|
||||
# channel: *ceph-channel
|
||||
cinder:
|
||||
charm: cs:cinder-310
|
||||
charm: cinder
|
||||
channel: *os-channel
|
||||
# cinder2:
|
||||
# charm: cs:cinder-310
|
||||
# charm: cinder
|
||||
# channel: *os-channel
|
||||
cinder-ceph:
|
||||
charm: cs:cinder-ceph-262 # upgrade to support availability-zone specification
|
||||
charm: cinder-ceph
|
||||
channel: *os-channel
|
||||
controller-server:
|
||||
charm: cs:ubuntu-18
|
||||
charm: ubuntu
|
||||
channel: latest/stable
|
||||
lma-server:
|
||||
charm: cs:ubuntu-18
|
||||
charm: ubuntu
|
||||
channel: latest/stable
|
||||
series: bionic
|
||||
easyrsa:
|
||||
charm: cs:~containers/easyrsa-408
|
||||
@ -43,9 +60,11 @@ applications:
|
||||
filebeat:
|
||||
charm: cs:filebeat-33
|
||||
glance:
|
||||
charm: cs:glance-305
|
||||
charm: glance
|
||||
channel: *os-channel
|
||||
gnocchi:
|
||||
charm: cs:gnocchi-46
|
||||
charm: gnocchi
|
||||
channel: *os-channel
|
||||
grafana:
|
||||
charm: cs:grafana-49
|
||||
graylog:
|
||||
@ -53,43 +72,63 @@ applications:
|
||||
graylog-mongodb:
|
||||
charm: cs:mongodb-67
|
||||
hacluster-aodh:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-cinder:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
# hacluster-cinder2:
|
||||
# charm: cs:hacluster-76
|
||||
# charm: hacluster
|
||||
# channel: *hacluster-channel
|
||||
hacluster-glance:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-gnocchi:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-heat:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-horizon:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-placement:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-keystone:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-neutron:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
hacluster-nova:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
# hacluster-radosgw:
|
||||
# charm: cs:hacluster-76
|
||||
# charm: hacluster
|
||||
# channel: *hacluster-channel
|
||||
hacluster-vault:
|
||||
charm: cs:hacluster-76
|
||||
charm: hacluster
|
||||
channel: *hacluster-channel
|
||||
heat:
|
||||
charm: cs:heat-283
|
||||
charm: heat
|
||||
channel: *os-channel
|
||||
juniper-server:
|
||||
charm: cs:ubuntu-18
|
||||
charm: ubuntu
|
||||
channel: latest/stable
|
||||
keystone-ldap-domain1:
|
||||
charm: cs:keystone-ldap-35
|
||||
charm: keystone-ldap
|
||||
channel: *os-channel
|
||||
keystone-ldap-domain2:
|
||||
charm: cs:keystone-ldap-35
|
||||
charm: keystone-ldap
|
||||
channel: *os-channel
|
||||
keystone-ldap-domain3:
|
||||
charm: cs:keystone-ldap-35
|
||||
charm: keystone-ldap
|
||||
channel: *os-channel
|
||||
keystone:
|
||||
charm: cs:keystone-323
|
||||
charm: keystone
|
||||
channel: *os-channel
|
||||
revision: 583
|
||||
landscape-client:
|
||||
charm: cs:landscape-client-35
|
||||
landscape-client-bionic:
|
||||
@ -100,7 +139,8 @@ applications:
|
||||
charm: cs:postgresql-233
|
||||
series: bionic
|
||||
landscape-rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server-438 # attempted fix for LP#1939702
|
||||
charm: rabbitmq-server
|
||||
channel: *rmq-channel
|
||||
landscape-server:
|
||||
charm: cs:landscape-server-39
|
||||
series: bionic
|
||||
@ -113,69 +153,80 @@ applications:
|
||||
# lldpd:
|
||||
# charm: cs:lldpd-9
|
||||
memcached:
|
||||
charm: cs:memcached-32
|
||||
charm: memcached
|
||||
channel: latest/stable
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:mysql-innodb-cluster-15
|
||||
charm: mysql-innodb-cluster
|
||||
channel: *mysql-channel
|
||||
aodh-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
keystone-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
cinder-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
glance-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
gnocchi-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
heat-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
neutron-api-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
openstack-dashboard-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
placement-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
vault-mysql-router:
|
||||
charm: mysql-router
|
||||
channel: 8.0/stable
|
||||
channel: *mysql-channel
|
||||
nagios:
|
||||
charm: cs:nagios-44
|
||||
charm: nagios
|
||||
channel: latest/stable
|
||||
series: bionic
|
||||
neutron-gateway:
|
||||
charm: cs:neutron-gateway-291
|
||||
charm: neutron-gateway
|
||||
channel: *os-channel
|
||||
neutron-openvswitch:
|
||||
charm: cs:neutron-openvswitch-282
|
||||
charm: neutron-openvswitch
|
||||
channel: *os-channel
|
||||
neutron-api:
|
||||
charm: cs:neutron-api-294
|
||||
charm: neutron-api
|
||||
channel: *os-channel
|
||||
placement:
|
||||
charm: cs:placement-19
|
||||
charm: placement
|
||||
channel: *os-channel
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller-549 # bug LP#1928992 Placement endpoints not being updated, or perhaps regressing to n-c-c endpoints, even after deploying placement service for train
|
||||
charm: nova-cloud-controller
|
||||
channel: *os-channel
|
||||
nova-compute:
|
||||
charm: nova-compute
|
||||
channel: "ussuri/edge"
|
||||
series: *charm-series
|
||||
channel: *os-channel
|
||||
nrpe-container:
|
||||
charm: cs:nrpe-73
|
||||
charm: nrpe
|
||||
channel: latest/stable
|
||||
nrpe-host:
|
||||
charm: cs:nrpe-73
|
||||
charm: nrpe
|
||||
channel: latest/stable
|
||||
# nrpe-kvm:
|
||||
# charm: cs:nrpe-73
|
||||
# charm: nrpe
|
||||
# channel: latest/stable
|
||||
ntp:
|
||||
charm: cs:ntp-46
|
||||
openstack-dashboard:
|
||||
charm: cs:openstack-dashboard-313
|
||||
charm: openstack-dashboard
|
||||
channel: *os-channel
|
||||
openstack-service-checks:
|
||||
#charm: cs:openstack-service-checks-4 # this breaks SSL because of certifi bug 1924816
|
||||
charm: cs:~llama-charmers-next/openstack-service-checks-12
|
||||
@ -184,17 +235,20 @@ applications:
|
||||
prometheus-openstack-exporter:
|
||||
charm: cs:prometheus-openstack-exporter-17
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server-438 # attempted fix for LP#1939702
|
||||
#charm: cs:rabbitmq-server-110
|
||||
charm: rabbitmq-server
|
||||
channel: *rmq-channel
|
||||
sysconfig-compute:
|
||||
charm: cs:sysconfig-2
|
||||
sysconfig-control:
|
||||
charm: cs:sysconfig-2
|
||||
telegraf:
|
||||
charm: cs:telegraf-41
|
||||
charm: telegraf
|
||||
channel: latest/stable
|
||||
telegraf-prometheus:
|
||||
charm: cs:telegraf-41
|
||||
charm: telegraf
|
||||
channel: latest/stable
|
||||
# thruk-agent:
|
||||
# charm: cs:thruk-agent-10
|
||||
vault:
|
||||
charm: cs:vault-46
|
||||
charm: vault
|
||||
channel: 1.7/stable
|
||||
|
||||
@ -10,3 +10,7 @@ os_compute_api:os-availability-zone:detail: rule:context_is_tenantLead or rule:s
|
||||
os_compute_api:os-extended-server-attributes: rule:context_is_tenantLead or rule:system_admin_api
|
||||
os_compute_api:os-hosts: rule:context_is_tenantLead or rule:admin_api
|
||||
os_compute_api:os-hypervisors:servers: rule:context_is_tenantLead or rule:system_reader_api
|
||||
os_compute_api:os-hypervisors:list-detail: rule:context_is_tenantLead or rule:system_reader_api
|
||||
os_compute_api:os-migrate-server:migrate: rule:context_is_tenantLead or rule:system_admin_api
|
||||
os_compute_api:os-migrate-server:migrate_live: rule:context_is_tenantLead or rule:system_admin_api
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user