diff --git a/bundles/openstack/bundle-ceph-config.yaml b/bundles/openstack/bundle-ceph-config.yaml index 533f746d60bfae57ed0a1e198c0aa57ca384c83e..87508c53aaddaad5382d7fd1b6e16ecfcf6929a2 100644 --- a/bundles/openstack/bundle-ceph-config.yaml +++ b/bundles/openstack/bundle-ceph-config.yaml @@ -180,6 +180,7 @@ applications: to: - 'lxd:2' - 'lxd:1' + - 'lxd:1' percona-cluster: charm: cs:percona-cluster @@ -196,6 +197,7 @@ applications: to: - 'lxd:1' - 'lxd:2' + - 'lxd:2' keystone: charm: cs:keystone @@ -213,6 +215,7 @@ applications: to: - 'lxd:2' - 'lxd:1' + - 'lxd:1' openstack-dashboard: charm: cs:openstack-dashboard @@ -227,6 +230,7 @@ applications: to: - 'lxd:1' - 'lxd:2' + - 'lxd:2' nova-compute: charm: cs:nova-compute @@ -253,6 +257,7 @@ applications: to: - 'lxd:1' - 'lxd:2' + - 'lxd:1' neutron-api: charm: cs:neutron-api @@ -267,6 +272,7 @@ applications: to: - 'lxd:2' - 'lxd:1' + - 'lxd:2' neutron-openvswitch: charm: cs:neutron-openvswitch @@ -286,6 +292,7 @@ applications: to: - 'lxd:1' - 'lxd:2' + - 'lxd:1' cinder-ceph: charm: cs:cinder-ceph @@ -302,9 +309,9 @@ applications: nagios_context: *nagios_context num_units: 3 to: - - 'lxd:0' - - 'lxd:1' - - 'lxd:1' + - 'lxd:3' + - 'lxd:4' + - 'lxd:3' annotations: gui-x: '1200' gui-y: '400' @@ -341,6 +348,7 @@ applications: to: - 'lxd:2' - 'lxd:1' + - 'lxd:1' glance: charm: cs:glance @@ -355,6 +363,7 @@ applications: to: - 'lxd:1' - 'lxd:2' + - 'lxd:2' memcached: charm: cs:memcached @@ -366,6 +375,7 @@ applications: to: - 'lxd:2' - 'lxd:1' + - 'lxd:2' neutron-gateway: diff --git a/bundles/openstack/bundle-openstack-ceph-base.yaml b/bundles/openstack/bundle-openstack-ceph-base.yaml index b498b769b6bdbf7cdea1bc0930c795a2a74f83f2..a300550fe02ea6161fda682a25ecb16bf9297356 100644 --- a/bundles/openstack/bundle-openstack-ceph-base.yaml +++ b/bundles/openstack/bundle-openstack-ceph-base.yaml @@ -37,7 +37,7 @@ parameters: network-device-mtu: &network_device_mtu 9000 instance-mtu: &instance_mtu 8000 enable-dvr: &dvr-mode False - vlan-ranges: &vlan_ranges physnet-ovs:801:801 + vlan-ranges: &vlan_ranges physnet-ovs:1000:2000 enable-local-dhcp-and-metadata: &enable_local_dhcp_and_metadata True enable-ml2-dns: &enable_ml2_dns True dns-domain: &dns_domain garr.cloud.na.