Remove env.d overrides for Queens

A series of env.d overrides were applied in order to deploy the Pike
container infrastructure with the same hyperconverged scenario that
was implemented for Queens. Now that OSA has been updated to queens,
these overrides are no longer needed.

Change-Id: I57107d101368d76d508d2ebcc2fc27f3110aa197

openstack_deploy/env.d/cinder-volume.yml

@@ -0,0 +1,6 @@
+---
+
+container_skel:
+  cinder_volumes_container:
+    properties:
+      is_metal: false

openstack_deploy/env.d/cinder.yml

@@ -1,13 +0,0 @@
----
-
-container_skel:
-  cinder_api_container:
-    belongs_to:
-      - storage-infra_containers
-    contains:
-      - cinder_api
-      - cinder_scheduler
-  cinder_scheduler_container: {}
-  cinder_volumes_container:
-    properties:
-      is_metal: false

openstack_deploy/env.d/heat.yml

@@ -1,13 +0,0 @@
----
-
-container_skel:
-  heat_api_container:
-    belongs_to:
-      - orchestration_containers
-      - os-infra_containers
-    contains:
-      - heat_api_cfn
-      - heat_api
-      - heat_engine
-  heat_apis_container: {}
-  heat_engine_container: {}

openstack_deploy/env.d/neutron.yml

@@ -1,6 +0,0 @@
----
-
-container_skel:
-  neutron_agents_container:
-    properties:
-      is_metal: true

openstack_deploy/env.d/nova.yml

@@ -1,20 +0,0 @@
----
-
-container_skel:
-  nova_api_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_api_metadata
-      - nova_api_os_compute
-      - nova_api_placement
-      - nova_conductor
-      - nova_scheduler
-      - nova_console
-  nova_api_metadata_container: {}
-  nova_api_os_compute_container: {}
-  nova_api_placement_container: {}
-  nova_conductor_container: {}
-  nova_scheduler_container: {}
-  nova_console_container: {}