make group membership blocks optional

Deployers sometime need the ability to opt out of specific deployment
groups. While a deployer can modify or extend the configuration
groups using conf.d files, until now they didn't have the ability
to remove groups when testing different scenarios. This change
simply adds conditionals to the openstack_user_config giving users
the ability to tailor the default user configuration options to
their needs.

Change-Id: I100ddf09faa072a999b72c4e46a1d3de6480d7e6
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2017-09-28 13:43:12 -05:00
parent 89e45170fe
commit bc2e128143
No known key found for this signature in database
GPG Key ID: 69FEFFC5E2D9273F
2 changed files with 39 additions and 9 deletions

View File

@ -105,3 +105,14 @@ mnaio_host_networks:
inet_type: 'static' inet_type: 'static'
address: '10.0.244.1/22' address: '10.0.244.1/22'
iface_port: none iface_port: none
osa_enable_infra: true
osa_enable_identity: true
osa_enable_block_storage: true
osa_enable_image: true
osa_enable_compute: true
osa_enable_orchestration: true
osa_enable_dashboard: true
osa_enable_network: true
osa_enable_meter: true
osa_enable_object_storage: true

View File

@ -140,6 +140,7 @@ swift_block: &swift_block
### Infrastructure ### Infrastructure
### ###
{% if osa_enable_infra | bool %}
# galera, memcache, rabbitmq, utility # galera, memcache, rabbitmq, utility
shared-infra_hosts: *infra_block shared-infra_hosts: *infra_block
@ -152,35 +153,56 @@ log_hosts: *log_block
# load balancer # load balancer
haproxy_hosts: *loadbalancer_block haproxy_hosts: *loadbalancer_block
# Legacy infra hosts
os-infra_hosts: *infra_block
{% endif %}
### ###
### OpenStack ### OpenStack
### ###
# Legacy infra hosts {% if osa_enable_identity | bool %}
os-infra_hosts: *infra_block
# keystone # keystone
identity_hosts: *infra_block identity_hosts: *infra_block
{% endif %}
{% if osa_enable_block_storage | bool %}
# cinder api services # cinder api services
storage-infra_hosts: *infra_block storage-infra_hosts: *infra_block
# cinder storage host (LVM-backed)
storage_hosts: *cinder_block
{% endif %}
{% if osa_enable_image | bool %}
# glance # glance
image_hosts: *infra_block image_hosts: *infra_block
{% endif %}
{% if osa_enable_compute | bool %}
# nova api, conductor, etc services # nova api, conductor, etc services
compute-infra_hosts: *infra_block compute-infra_hosts: *infra_block
# nova hypervisors
compute_hosts: *compute_block
{% endif %}
{% if osa_enable_orchestration | bool %}
# heat # heat
orchestration_hosts: *infra_block orchestration_hosts: *infra_block
{% endif %}
{% if osa_enable_dashboard | bool %}
# horizon # horizon
dashboard_hosts: *infra_block dashboard_hosts: *infra_block
{% endif %}
{% if osa_enable_network | bool %}
# neutron server, agents (L3, etc) # neutron server, agents (L3, etc)
network_hosts: *infra_block network_hosts: *infra_block
{% endif %}
{% if osa_enable_meter | bool %}
# ceilometer (telemetry data collection) # ceilometer (telemetry data collection)
metering-infra_hosts: *infra_block metering-infra_hosts: *infra_block
@ -192,15 +214,12 @@ metrics_hosts: *infra_block
# ceilometer compute agent (telemetry data collection) # ceilometer compute agent (telemetry data collection)
metering-compute_hosts: *compute_block metering-compute_hosts: *compute_block
{% endif %}
# nova hypervisors {% if osa_enable_object_storage | bool %}
compute_hosts: *compute_block
# cinder storage host (LVM-backed)
storage_hosts: *cinder_block
# swift storage hosts # swift storage hosts
swift_hosts: *swift_block swift_hosts: *swift_block
# swift infra hosts # swift infra hosts
swift-proxy_hosts: *infra_block swift-proxy_hosts: *infra_block
{% endif %}