openstack/openstack-ansible
Code Issues Proposed changes

Merge "Remove unused properties from environment files"

Browse Source
This commit is contained in:
Jenkins 2017-05-09 19:08:07 +00:00 committed by Gerrit Code Review
commit 72c3cb721c
31 changed files with 2 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy-guide/source/app-custom-layouts.rst
View File

@ -148,8 +148,6 @@ following steps:
contains:
- galera
properties:
log_directory: mysql_logs
service_name: galera
is_metal: true
.. note::

4
osa_toolkit/generate.py
View File

@ -682,7 +682,7 @@ def container_skel_load(container_skel, inventory, config):
key,
container_type,
inventory,
value.get('properties')
value.get('properties', {})
)
else:
cidr_networks = config.get('cidr_networks')
@ -932,7 +932,7 @@ def _check_config_settings(cidr_networks, config, container_skel):
# search for any container that doesn't have is_metal flag set to true
is_provider_networks_needed = False
for key, value in container_skel.iteritems():
properties = value.get('properties')
properties = value.get('properties', {})
is_metal = properties.get('is_metal', False)
if not is_metal:
is_provider_networks_needed = True

2
playbooks/inventory/env.d/aodh.yml
View File

@ -22,8 +22,6 @@ container_skel:
- aodh_listener
- aodh_alarm_evaluator
- aodh_alarm_notifier
properties:
service_name: aodh
physical_skel:
metering-alarm_containers:

2
playbooks/inventory/env.d/barbican.yml
View File

@ -24,8 +24,6 @@ container_skel:
- key-manager_containers
contains:
- barbican_api
properties:
service_name: barbican
physical_skel:
key-manager_containers:

3
playbooks/inventory/env.d/ceilometer.yml
View File

@ -17,8 +17,6 @@ container_skel:
contains:
- ceilometer_agent_central
- ceilometer_agent_notification
properties:
service_name: ceilometer
metering-compute_container:
belongs_to:
- metering-compute_containers
@ -26,7 +24,6 @@ container_skel:
- ceilometer_agent_compute
properties:
is_metal: true
service_name: ceilometer
physical_skel:
metering-compute_containers:

3
playbooks/inventory/env.d/ceph.yml
View File

@ -27,8 +27,6 @@ container_skel:
- ceph-mon_containers
contains:
- ceph-mon
properties:
service_name: ceph
ceph-osd_container:
belongs_to:
- ceph-osd_containers
@ -36,7 +34,6 @@ container_skel:
- ceph-osd
properties:
is_metal: true
service_name: ceph
physical_skel:
ceph-mon_containers:

3
playbooks/inventory/env.d/cinder.yml
View File

@ -35,8 +35,6 @@ container_skel:
contains:
- cinder_api
- cinder_scheduler
properties:
service_name: cinder
cinder_volumes_container:
belongs_to:
- storage_containers
@ -51,7 +49,6 @@ container_skel:
# leave is_metal off, alternatively you will have to migrate your volumes once
# deployed on metal.
is_metal: true
service_name: cinder
physical_skel:

2
playbooks/inventory/env.d/designate.yml
View File

@ -44,8 +44,6 @@ container_skel:
- designate_worker
- designate_producer
- designate_sink
properties:
service_name: designate
physical_skel:
dnsaas_containers:

3
playbooks/inventory/env.d/galera.yml
View File

@ -26,9 +26,6 @@ container_skel:
- shared-infra_containers
contains:
- galera
properties:
log_directory: mysql_logs
service_name: galera
physical_skel:

1
playbooks/inventory/env.d/glance.yml
View File

@ -31,7 +31,6 @@ container_skel:
- glance_api
- glance_registry
properties:
service_name: glance
container_fs_size: 12G

2
playbooks/inventory/env.d/gnocchi.yml
View File

@ -28,8 +28,6 @@ container_skel:
contains:
- gnocchi_api
- gnocchi_metricd
properties:
service_name: gnocchi
physical_skel:
metrics_containers:

1
playbooks/inventory/env.d/haproxy.yml
View File

@ -26,7 +26,6 @@ container_skel:
contains:
- haproxy
properties:
service_name: haproxy
is_metal: true
physical_skel:

4
playbooks/inventory/env.d/heat.yml
View File

@ -37,16 +37,12 @@ container_skel:
- heat_api_cloudwatch
- heat_api_cfn
- heat_api
properties:
service_name: heat
heat_engine_container:
belongs_to:
- orchestration_containers
- os-infra_containers
contains:
- heat_engine
properties:
service_name: heat
physical_skel:

2
playbooks/inventory/env.d/horizon.yml
View File

@ -26,8 +26,6 @@ container_skel:
- os-infra_containers
contains:
- horizon
properties:
service_name: horizon
physical_skel:

3
playbooks/inventory/env.d/ironic.yml
View File

@ -37,8 +37,6 @@ container_skel:
- ironic_api
- ironic_conductor
- ironic_server
properties:
service_name: ironic
ironic_compute_container:
belongs_to:
- ironic-compute_containers
@ -50,7 +48,6 @@ container_skel:
- neutron_openvswitch_agent
properties:
is_metal: false
service_name: nova
physical_skel:

2
playbooks/inventory/env.d/keystone.yml
View File

@ -25,8 +25,6 @@ container_skel:
- identity_containers
contains:
- keystone
properties:
service_name: keystone
physical_skel:

2
playbooks/inventory/env.d/magnum.yml
View File

@ -27,8 +27,6 @@ container_skel:
- magnum-infra_containers
contains:
- magnum
properties:
service_name: magnum
physical_skel:
magnum-infra_containers:

2
playbooks/inventory/env.d/memcache.yml
View File

@ -26,8 +26,6 @@ container_skel:
- shared-infra_containers
contains:
- memcached
properties:
service_name: memcached
physical_skel:

2
playbooks/inventory/env.d/molteniron.yml
View File

@ -25,8 +25,6 @@ container_skel:
- molteniron-server_containers
contains:
- molteniron
properties:
service_name: molteniron
physical_skel:
molteniron-server_containers:

4
playbooks/inventory/env.d/neutron.yml
View File

@ -63,15 +63,11 @@ container_skel:
- neutron_dhcp_agent
- neutron_lbaas_agent
- neutron_bgp_dragent
properties:
service_name: neutron
neutron_server_container:
belongs_to:
- network_containers
contains:
- neutron_server
properties:
service_name: neutron
physical_skel:

13
playbooks/inventory/env.d/nova.yml
View File

@ -44,24 +44,18 @@ container_skel:
- os-infra_containers
contains:
- nova_api_metadata
properties:
service_name: nova
nova_api_os_compute_container:
belongs_to:
- compute-infra_containers
- os-infra_containers
contains:
- nova_api_os_compute
properties:
service_name: nova
nova_api_placement_container:
belongs_to:
- compute-infra_containers
- os-infra_containers
contains:
- nova_api_placement
properties:
service_name: nova
nova_compute_container:
belongs_to:
- compute_containers
@ -72,31 +66,24 @@ container_skel:
- nova_compute
properties:
is_metal: true
service_name: nova
nova_conductor_container:
belongs_to:
- compute-infra_containers
- os-infra_containers
contains:
- nova_conductor
properties:
service_name: nova
nova_scheduler_container:
belongs_to:
- compute-infra_containers
- os-infra_containers
contains:
- nova_scheduler
properties:
service_name: nova
nova_console_container:
belongs_to:
- compute-infra_containers
- os-infra_containers
contains:
- nova_console
properties:
service_name: nova
physical_skel:

2
playbooks/inventory/env.d/octavia.yml
View File

@ -37,8 +37,6 @@ container_skel:
- octavia-worker
- octavia-housekeeping
- octavia-health-manager
properties:
service_name: octavia
physical_skel:
octavia-infra_containers:

2
playbooks/inventory/env.d/pkg_repo.yml
View File

@ -25,8 +25,6 @@ container_skel:
- repo-infra_containers
contains:
- pkg_repo
properties:
service_name: repo
physical_skel:

2
playbooks/inventory/env.d/rabbitmq.yml
View File

@ -26,8 +26,6 @@ container_skel:
- shared-infra_containers
contains:
- rabbitmq
properties:
service_name: rabbitmq
physical_skel:

2
playbooks/inventory/env.d/rsyslog.yml
View File

@ -25,8 +25,6 @@ container_skel:
- log_containers
contains:
- rsyslog
properties:
service_name: rsyslog
physical_skel:

2
playbooks/inventory/env.d/sahara.yml
View File

@ -26,8 +26,6 @@ container_skel:
contains:
- sahara_api
- sahara_engine
properties:
service_name: sahara
physical_skel:
sahara-infra_containers:

1
playbooks/inventory/env.d/swift-remote.yml
View File

@ -27,7 +27,6 @@ container_skel:
- swift_remote
properties:
is_metal: true
service_name: swift
physical_skel:

5
playbooks/inventory/env.d/swift.yml
View File

@ -34,8 +34,6 @@ container_skel:
- swift-proxy_containers
contains:
- swift_proxy
properties:
service_name: swift
swift_acc_container:
belongs_to:
- swift_containers
@ -43,7 +41,6 @@ container_skel:
- swift_acc
properties:
is_metal: true
service_name: swift
swift_obj_container:
belongs_to:
- swift_containers
@ -51,7 +48,6 @@ container_skel:
- swift_obj
properties:
is_metal: true
service_name: swift
swift_cont_container:
belongs_to:
- swift_containers
@ -59,7 +55,6 @@ container_skel:
- swift_cont
properties:
is_metal: true
service_name: swift
physical_skel:

2
playbooks/inventory/env.d/trove.yml
View File

@ -35,8 +35,6 @@ container_skel:
- trove_api
- trove_conductor
- trove_taskmanager
properties:
service_name: trove
physical_skel:
trove-infra_containers:

2
playbooks/inventory/env.d/unbound.yml
View File

@ -24,8 +24,6 @@ container_skel:
- unbound_containers
contains:
- unbound
properties:
service_name: unbound
physical_skel:
unbound_containers:

2
playbooks/inventory/env.d/utility.yml
View File

@ -26,8 +26,6 @@ container_skel:
- shared-infra_containers
contains:
- utility
properties:
service_name: utility
physical_skel: