From c7237c52bb90b3b6307eddc55d9e5f70c6eab03c Mon Sep 17 00:00:00 2001 From: Alex Barchiesi <alex.barchiesi@garr.it> Date: Fri, 20 Oct 2017 10:02:37 +0200 Subject: [PATCH] Moved parameters to bundle-config.yaml --- bundles/openstack/bundle_template.yaml | 308 ++----------------------- bundles/openstack/deploy-openstack.rst | 7 +- 2 files changed, 19 insertions(+), 296 deletions(-) diff --git a/bundles/openstack/bundle_template.yaml b/bundles/openstack/bundle_template.yaml index 0de80591..02d73b85 100644 --- a/bundles/openstack/bundle_template.yaml +++ b/bundles/openstack/bundle_template.yaml @@ -1,94 +1,46 @@ ## Sample bundle for the deployment of OpenStack in a region of the ## GARR Federated Cloud Platform. -variables: +defaults: # sources openstack-origin: &openstack_origin cloud:xenial-ocata series: &series xenial # Region settings -#EDIT# region: ®ion <yoursite_yourdep> -#EDIT# nagios_context: &nagios_context <yoursite_yourdep> -#EDIT# default-gw-pub: &default_gw_pub <your_default_public_gateway_in_CIDR_notation> -#EDIT# access-network: &access_network <network_used_by_rabbit_and_percona> -#EDIT# source_ntp: &source_ntp <your_NTP_server> -#EDIT# os-data-network: &os_data_network <your_OS_data_network> + region: ®ion RegionOne # Ceph configs -#EDIT# ceph-fsid: &ceph_fsid <your_FSID_here> -#EDIT# ceph-monitor-hosts: &ceph_monitor_hosts [cephmon1:port[ cephmon2:port cephmon3:port]] - - ceph-radosgw-pool-prefix: &ceph_radosgw_pool_prefix testrgw + ceph-radosgw-pool-prefix: &ceph_radosgw_pool_prefix rgw ceph-radosgw-lightweight-pool-pg-num: &ceph_radosgw_lightweight_pool_pg_num 8 ceph-radosgw-rgw-buckets-pool-weight: &ceph_radosgw_rgw_buckets_pool_weight 5 ceph-radosgw-config-flags: &ceph_radosgw_config_flags -#EDIT# ceph-radosgw-ceph-osd-replication-count: &ceph_radosgw_replication_count 2 - - # vips (number of VIPs should match number of different bindings) - -#EDIT# vip-ceilometer: &vip_ceilometer <your_VIP_priv_8> <your_VIP_pub_8> -#EDIT# vip-ceph-radosgw: &vip_ceph_radosgw <your_VIP_priv_7> <your_VIP_pub_7> -#EDIT# vip-cinder: &vip_cinder <your_VIP_priv_0> <your_VIP_pub_0> -#EDIT# vip-glance: &vip_glance <your_VIP_priv_5> <your_VIP_pub_5> -#EDIT# vip-heat: &vip_heat <your_VIP_priv_4> <your_VIP_pub_4> -#EDIT# vip-dashboard: &vip_dashboard <your_VIP_pub_2> -#EDIT# vip-keystone: &vip_keystone <your_VIP_priv_1> <your_VIP_pub_1> -#EDIT# vip-percona: &vip_percona <your_VIP_priv_2> -#EDIT# vip-neutron: &vip_neutron <your_VIP_priv_6> <your_VIP_pub_6> -#EDIT# vip-nova: &vip_nova_cloud_controller <your_VIP_priv_3> <your_VIP_pub_3> -#EDIT# console-proxy-ip: &console_proxy_ip <your_VIP_pub_3> - - # hostnames -#EDIT# os-public-hostname: &os_public_hostname <your_keystone_public_hostname> - - # network setup: should be the same cross-sites - ### Use network-space-* in bindings unless os-admin-* is usable instead -#EDIT# network-space-default: &network_space_default <your_MAAS_OS_mgmt_space> -#EDIT# network-space-pub: &network_space_pub <your_MAAS_pub_space> -#EDIT# network-space-os-data: &network_space_os_data <your_MAAS_OS_data_space> -#EDIT# network-space-os-mgmt: &network_space_os_mgmt <your_MAAS_OS_mgmt_space> + flat-network-providers: &flat_network_providers ext_net neutron-external-network: &neutron_external_network ext_net -#EDIT# data-port: &data_port br-ex:bond0.188 bridge-mappings: &bridge_mappings ext_net:br-ex network-device-mtu: &network_device_mtu 1500 - instance-mtu: &instance_mtu 1400 -#FG 2017-02-15 not working, silently keep default (gre) -# overlay-network-type: &overlay_network_type - enable-dvr: &dvr-mode True - vlan-ranges: &vlan_ranges physnet-ovs:801:801 - - # secrets and passwords -#EDIT# root-password: &root_password <your_root_password> -#EDIT# sst-password: &sst_password <your_sst_password> -#EDIT# admin-password: &admin_password <your_admin_password> -#EDIT# secret_dashboard: &secret_dashboard <your_secret> -#EDIT# encryption-key: &encryption_key <your_encryption_key> -# -# Please remember to change corosync_keys, running (on your preferred machine): -# corosync-keygen ; cat /etc/corosync/authkey | base64 -w 0 ; echo " " - corosync_key: &corosync_key 'hyhtRLDQvRnL8llTGCRuccdh29/ae+EwN9a5yyqfJHFkbzZXPIGmC/NUPEnd8JlYsXTWCBZrMj7WQATVmp3XBiBmzUzyYp2c5o76CCvgcsRvqZm9+D4j1k3oz5bBzYcIN88/NoUK8+6OU3E7mzw4q7k4W8WK0vPYqDAi5T2tLyM=' + instance-mtu: &instance_mtu 1400 + enable-dvr: &dvr-mode True + vlan-ranges: &vlan_ranges physnet-ovs:801:801 # keystone/dashboard preferred-api-version: &preferred_api_version 3 -#EDIT# admin-token: &admin_token <your_admin_token> # nova-compute worker-multiplier: &worker_multiplier '1.0' cpu-allocation-ratio: &cpu_allocation_ratio '2.0' ram-allocation-ratio: &ram_allocation_ratio '1.5' n-c-config-flags: &nova_compute_config_flags "block_device_allocate_retries=600,block_device_allocate_retries_interval=5" -# n-c-c-config-flags: &n_c_c_config_flags "scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter,AggregateInstanceExtraSpecsFilter,PciPassthroughFilter" - -#FG# pci-passthrough-whitelist: &pci_passthrough_whitelist '{ "devname": "bond1", "physical_network": "sriov"}' -#FG# vcpu-pin-set: &vcpu_pin_set '^0' hugepages: &hugepages '5%' libvirt-image-backend: &libvirt_image_backend cpu-mode: &cpu-mode -#FG# enable-local-dhcp-and-metadata: &enable_local_dhcp_and_metadata True -#FG# neutron-network-dvr: &neutron-dvr True + data-port: &data_port br-ex:bond0.188 + +# Ceilometer + event-time-to-live: &celiometer_event_time_to_live -1 + metering-time-to-live: &celiometer_metering_time_to_live -1 # ------------------------------------------------------------------------------ machines: @@ -110,6 +62,7 @@ machines: # ------------------------------------------------------------------------------ services: + controller: charm: cs:ubuntu num_units: 3 @@ -119,11 +72,10 @@ services: annotations: gui-x: '2000' gui-y: '0' + compute-host: charm: cs:ubuntu num_units: 2 - bindings: - "": *network_space_default to: - '3' - '4' @@ -151,8 +103,6 @@ services: defaultgw: charm: cs:~csd-garr/defaultgw - options: - gateway: *default_gw_pub annotations: gui-x: '800' gui-y: '0' @@ -160,14 +110,10 @@ services: ceph-radosgw-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: ceph,object,storage - nagios_context: *nagios_context annotations: gui-x: '1000' gui-y: '-200' @@ -175,14 +121,10 @@ services: cinder-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: ceph,block,storage - nagios_context: *nagios_context annotations: gui-x: '1250' gui-y: '350' @@ -190,14 +132,10 @@ services: controller-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: nova,compute - nagios_context: *nagios_context annotations: gui-x: '-200' gui-y: '500' @@ -205,14 +143,10 @@ services: glance-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: ceph,object,storage - nagios_context: *nagios_context annotations: gui-x: '1200' gui-y: '600' @@ -220,14 +154,10 @@ services: horizon-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: dashboard,web - nagios_context: *nagios_context annotations: gui-x: '250' gui-y: '50' @@ -235,14 +165,10 @@ services: keystone-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: keystone - nagios_context: *nagios_context annotations: gui-x: '350' gui-y: '350' @@ -250,14 +176,10 @@ services: neutron-api-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: neutron - nagios_context: *nagios_context annotations: gui-x: '550' gui-y: '1350' @@ -265,14 +187,10 @@ services: percona-hacluster: charm: cs:hacluster series: *series - bindings: - "": *network_space_os_mgmt options: action-managed-upgrade: True corosync_transport: 'unicast' - corosync_key: *corosync_key nagios_servicegroups: database - nagios_context: *nagios_context annotations: gui-x: '1300' gui-y: '800' @@ -282,15 +200,10 @@ services: charm: cs:nagios series: *series num_units: 1 - bindings: - "": *network_space_os_mgmt - website: *network_space_pub options: action-managed-upgrade: True - admin_email: csd-support@garr.it + admin_email: cloud-support@garr.it monitor_self: true - password: theNagiosPwd - ro-password: nagiosadmin to: - 'lxd:2' nrpe-controller: @@ -363,17 +276,12 @@ services: charm: cs:rabbitmq-server series: *series num_units: 3 - bindings: - "": *network_space_default - amqp: *network_space_os_mgmt options: action-managed-upgrade: True min-cluster-size: 2 - access-network: *access_network cluster-partition-handling: pause_minority management_plugin: True nagios_servicegroups: messaging - nagios_context: *nagios_context use-syslog: True to: - 'lxd:2' @@ -386,23 +294,13 @@ services: charm: cs:percona-cluster series: *series num_units: 3 - bindings: - "": *network_space_default - shared-db: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: action-managed-upgrade: True - access-network: *access_network - cluster-network: *access_network min-cluster-size: 2 innodb-buffer-pool-size: 10G lp1366997-workaround: True max-connections: 30000 nagios_servicegroups: database - nagios_context: *nagios_context - root-password: *root_password - sst-password: *sst_password - vip: *vip_percona to: - 'lxd:1' - 'lxd:2' @@ -414,29 +312,17 @@ services: charm: cs:keystone series: *series num_units: 3 - bindings: - "": *network_space_default - public: *network_space_pub - admin: *network_space_os_mgmt - internal: *network_space_os_mgmt - shared-db: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: action-managed-upgrade: True openstack-origin: *openstack_origin debug: 'False' verbose: 'False' - admin-password: *admin_password - admin-token: *admin_token admin-user: admin nagios_servicegroups: keystone - nagios_context: *nagios_context - os-public-hostname: *os_public_hostname worker-multiplier: *worker_multiplier preferred-api-version: *preferred_api_version region: *region use-syslog: True - vip: *vip_keystone to: - 'lxd:2' - 'lxd:1' @@ -448,27 +334,14 @@ services: charm: cs:openstack-dashboard series: *series num_units: 3 - bindings: - "": *network_space_default - shared-db: *network_space_os_mgmt - cluster: *network_space_os_mgmt - website: *network_space_pub - dashboard-plugin: *network_space_os_mgmt - identity-service: *network_space_os_mgmt options: openstack-origin: *openstack_origin action-managed-upgrade: True debug: 'False' endpoint-type: internalURL,publicURL nagios_servicegroups: dashboard,web - nagios_context: *nagios_context - secret: *secret_dashboard use-syslog: True - vip: *vip_dashboard webroot: '/' -#FG# neutron-network-l3ha: True -#FG# neutron-network-dvr: *neutron-dvr -#FG# cinder-backup: True to: - 'lxd:1' - 'lxd:2' @@ -480,37 +353,19 @@ services: charm: cs:nova-compute series: *series num_units: 2 - bindings: - "": *network_space_default - amqp: *network_space_os_mgmt - cloud-compute: *network_space_os_mgmt - image-service: *network_space_os_mgmt - ceph: *network_space_os_mgmt - compute-peer: *network_space_os_mgmt - neutron-plugin: *network_space_os_mgmt options: openstack-origin: *openstack_origin action-managed-upgrade: True debug: 'False' verbose: 'False' - config-flags: *nova_compute_config_flags cpu-mode: *cpu-mode -#AC# hugepages: *hugepages enable-live-migration: False enable-resize: False migration-auth-type: none -#FG# enable-resize: True -#FG# enable-live-migration: True -#FG# migration-auth-type: ssh - os-internal-network: &os_internal_network - libvirt-image-backend: *libvirt_image_backend nagios_servicegroups: nova,compute - nagios_context: *nagios_context use-internal-endpoints: True enable-resize: True enable-live-migration: True -#FG# pci-passthrough-whitelist: *pci_passthrough_whitelist -#AC# vcpu-pin-set: *vcpu_pin_set to: - '3' - '4' @@ -522,22 +377,6 @@ services: charm: cs:nova-cloud-controller series: *series num_units: 3 - bindings: - "": *network_space_default - public: *network_space_pub - admin: *network_space_os_mgmt - internal: *network_space_os_mgmt - amqp: *network_space_os_mgmt - cinder-volume-service: *network_space_os_mgmt - identity-service: *network_space_os_mgmt - image-service: *network_space_os_mgmt - quantum-network-service: *network_space_os_mgmt - cloud-compute: *network_space_os_mgmt - neutron-api: *network_space_os_mgmt -# cell: ### - memcache: *network_space_os_mgmt - shared-db: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: openstack-origin: *openstack_origin action-managed-upgrade: True @@ -545,17 +384,11 @@ services: verbose: 'False' region: *region console-access-protocol: 'vnc' - console-proxy-ip: *console_proxy_ip nagios_servicegroups: nova,compute - nagios_context: *nagios_context network-manager: Neutron - cpu-allocation-ratio: *cpu_allocation_ratio - ram-allocation-ratio: *ram_allocation_ratio -#FG# config-flags: *n_c_c_config_flags service-guard: True single-nova-consoleauth: False use-internal-endpoints: True - vip: *vip_nova_cloud_controller worker-multiplier: *worker_multiplier to: - 'lxd:1' @@ -568,17 +401,6 @@ services: charm: cs:neutron-api series: *series num_units: 3 - bindings: - "": *network_space_default - public: *network_space_pub - admin: *network_space_os_mgmt - internal: *network_space_os_mgmt - amqp: *network_space_os_mgmt - identity-service: *network_space_os_mgmt - neutron-api: *network_space_os_mgmt - neutron-plugin-api: *network_space_os_mgmt - shared-db: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: openstack-origin: *openstack_origin action-managed-upgrade: True @@ -586,22 +408,11 @@ services: verbose: 'False' region: *region enable-ml2-port-security: True - flat-network-providers: *flat_network_providers nagios_servicegroups: neutron - nagios_context: *nagios_context - neutron-external-network: *neutron_external_network neutron-security-groups: True network-device-mtu: *network_device_mtu -#FG# overlay-network-type: *overlay_network_type use-internal-endpoints: True - use-syslog: True - vip: *vip_neutron worker-multiplier: *worker_multiplier -#FG# enable-l3ha: True -#FG# dhcp-agents-per-network: 2 -#FG# enable-ml2-port-security: True -#FG# enable-sriov: True -#FG# enable-dvr: *dvr-mode to: - 'lxd:2' - 'lxd:1' @@ -612,23 +423,11 @@ services: neutron-openvswitch: charm: cs:neutron-openvswitch series: *series - bindings: - "": *network_space_default - amqp: *network_space_os_mgmt - data: *network_space_os_data - neutron-plugin: *network_space_os_mgmt - neutron-plugin-api: *network_space_os_mgmt options: action-managed-upgrade: True debug: 'False' verbose: 'False' -#FG# data-port: *data_port -#FG# bridge-mappings: *bridge_mappings -#FG# vlan-ranges: *vlan_ranges -#FG# enable-local-dhcp-and-metadata: *enable_local_dhcp_and_metadata disable-security-groups: False - flat-network-providers: *flat_network_providers - os-data-network: *os_data_network use-syslog: True annotations: gui-x: '1100' @@ -638,30 +437,15 @@ services: charm: cs:cinder series: *series num_units: 3 - bindings: - "": *network_space_default - public: *network_space_pub - admin: *network_space_os_mgmt - internal: *network_space_os_mgmt - amqp: *network_space_os_mgmt - cinder-volume-service: *network_space_os_mgmt - identity-service: *network_space_os_mgmt - image-service: *network_space_os_mgmt - ceph: *network_space_os_mgmt - storage-backend: *network_space_os_mgmt - shared-db: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: block-device: None openstack-origin: *openstack_origin action-managed-upgrade: True glance-api-version: 3 nagios_servicegroups: ceph,block,storage - nagios_context: *nagios_context region: *region use-syslog: True use-internal-endpoints: True - vip: *vip_cinder worker-multiplier: *worker_multiplier to: - 'lxd:1' @@ -674,10 +458,6 @@ services: charm: cs:cinder-ceph series: *series num_units: 0 - bindings: - "": *network_space_default - ceph: *network_space_os_mgmt - storage-backend: *network_space_os_mgmt annotations: gui-x: '1330' gui-y: '230' @@ -689,15 +469,6 @@ services: charm: cs:ceph-proxy series: *series num_units: 1 - bindings: - "": *network_space_default - public: *network_space_os_mgmt - client: *network_space_os_mgmt - radosgw: *network_space_os_mgmt - options: - fsid: *ceph_fsid - monitor-hosts: *ceph_monitor_hosts - admin-key: *ceph_admin_key to: - 'lxd:1' annotations: @@ -707,26 +478,13 @@ services: ceph-radosgw: charm: cs:ceph-radosgw series: *series - bindings: - "": *network_space_default - public: *network_space_pub - admin: *network_space_os_mgmt - internal: *network_space_os_mgmt - cluster: *network_space_os_mgmt num_units: 3 options: action-managed-upgrade: True - ceph-osd-replication-count: *ceph_radosgw_replication_count - config-flags: *ceph_radosgw_config_flags nagios_servicegroups: ceph,object,storage - nagios_context: *nagios_context - pool-prefix: *ceph_radosgw_pool_prefix region: *region restrict-ceph-pools: True - rgw-buckets-pool-weight: *ceph_radosgw_rgw_buckets_pool_weight - rgw-lightweight-pool-pg-num: *ceph_radosgw_lightweight_pool_pg_num use-syslog: True - vip: *vip_ceph_radosgw annotations: "gui-x": "1000" "gui-y": "0" @@ -738,19 +496,6 @@ services: charm: cs:glance series: *series num_units: 3 - bindings: - "": *network_space_default - public: *network_space_pub - admin: *network_space_os_mgmt - internal: *network_space_os_mgmt - amqp: *network_space_os_mgmt - cinder-volume-service: *network_space_os_mgmt - identity-service: *network_space_os_mgmt - image-service: *network_space_os_mgmt - ceph: *network_space_os_mgmt - storage-backend: *network_space_os_mgmt - shared-db: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: openstack-origin: *openstack_origin action-managed-upgrade: True @@ -758,11 +503,8 @@ services: verbose: 'False' region: *region nagios_servicegroups: ceph,object,storage - nagios_context: *nagios_context - worker-multiplier: *worker_multiplier use-internal-endpoints: True use-syslog: True - vip: *vip_glance restrict-ceph-pools: True to: - 'lxd:2' @@ -775,14 +517,9 @@ services: charm: cs:memcached series: *series num_units: 3 - bindings: - "": *network_space_default - cache: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: action-managed-upgrade: True allow-ufw-ip6-softfail: True - nagios_context: *nagios_context to: - 'lxd:1' - 'lxd:2' @@ -794,23 +531,14 @@ services: charm: cs:neutron-gateway series: *series num_units: 1 - bindings: - "": *network_space_default - data: *network_space_os_data - amqp: *network_space_os_mgmt - quantum-network-service: *network_space_os_mgmt - neutron-plugin-api: *network_space_os_mgmt - cluster: *network_space_os_mgmt options: openstack-origin: *openstack_origin action-managed-upgrade: True bridge-mappings: *bridge_mappings data-port: *data_port -# Lower instance MTU to fit GRE tunnel (without changing switch config etc) + # Lower instance MTU to fit GRE tunnel (without changing switch config etc) instance-mtu: *instance_mtu nagios_servicegroups: neutron - nagios_context: *nagios_context - os-data-network: *os_data_network to: - '0' annotations: @@ -821,10 +549,6 @@ ceilometer: charm: cs:ceilometer series: xenial num_units: 1 - bindings: - public: *network_space_pub - admin: *network_space_os_mgmt - internal: *network_space_os_mgmt options: action-managed-upgrade: True debug: False diff --git a/bundles/openstack/deploy-openstack.rst b/bundles/openstack/deploy-openstack.rst index 116255dd..175c0ca6 100644 --- a/bundles/openstack/deploy-openstack.rst +++ b/bundles/openstack/deploy-openstack.rst @@ -66,16 +66,15 @@ Deployment Prepare your own bundle ....................... -Edit the bundle to suite your needs: as a minimum, you should uncomment and edit -to suit your configuration all lines starting -with **#EDIT#**. Moreover, you should pay attention to the following: +Edit the file `bundle-config.yaml` to suite your needs: in particular provide the proper values for the parameters within `<...>`. +Moreover, you should pay attention to the following: - check neutron configuration in the three charms neutron-api neutron-openvswitch neutron-gateway - make sure the physical nodes have been properly labeled to match setting in the head of the bundle file Deploy your bundle .................. - juju deploy ./bundle.yaml + juju deploy ./bundle.yaml --bundle-config bundle-config.yaml and enjoy a looong coffee... -- GitLab