Merge "Containerized control plane with Dell EMC ScaleIO storage" into stable/queens

docker/services/glance-api.yaml

@@ -87,6 +87,10 @@ parameters:
       description: >
         The Ceph cluster name must be at least 1 character and contain only
         letters and numbers.
+  GlanceApiOptVolumes:
+    default: []
+    description: list of optional volumes to be mounted
+    type: comma_delimited_list
 
 conditions:
 
@@ -186,6 +190,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 - {get_attr: [GlanceLogging, volumes]}
+                - {get_param: GlanceApiOptVolumes}
                 -
                   - /var/lib/kolla/config_files/glance_api.json:/var/lib/kolla/config_files/config.json
                   - /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro

environments/cinder-scaleio-config.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 # A Heat environment file which can be used to enable a
-# a Cinder Dell EMC SacleIO backend, configured via puppet
+# a Cinder Dell EMC ScaleIO backend, configured via puppet
 resource_registry:
   OS::TripleO::Services::CinderBackendScaleIO: ../puppet/services/cinder-backend-scaleio.yaml
 

environments/containerized-control-plane-dellemc-scaleio.yaml

@@ -0,0 +1,35 @@
+# Copyright (c) 2017 Dell Inc, or its subsidiaries.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#   Configure and include this environment to enable the use of ScaleIO
+#   within a containerized control plane.
+
+parameter_defaults:
+  # Volumes to map into Cinder Volume container
+  # Type: array
+  CinderVolumeOptVolumes:
+   - /opt/emc/scaleio:/opt/emc/scaleio
+   - /bin/emc/scaleio:/bin/emc/scaleio
+
+  # Volume to map into Nova Compute container
+  # Type: array
+  NovaComputeOptVolumes:
+   - /opt/emc/scaleio:/opt/emc/scaleio
+   - /bin/emc/scaleio:/bin/emc/scaleio
+
+  # Volume to map into Glance API container
+  # Type: array
+  GlanceApiOptVolumes:
+   - /opt/emc/scaleio:/opt/emc/scaleio
+   - /bin/emc/scaleio:/bin/emc/scaleio