Merge "Fix featureset024 to deploy Ceph not in containers via puppet-ceph"

config/general_config/featureset024.yml

@@ -28,6 +28,7 @@ telemetry_args: >-
    {% endif %}
 
 extra_args: >-
+  -e {{ overcloud_templates_path }}/environments/puppet-ceph.yaml
   {% if release not in ['newton', 'ocata'] %}-e {{ overcloud_templates_path }}/ci/environments/ceph-min-osds.yaml{% endif %}
   --ntp-server pool.ntp.org
 test_ping: true

config/general_config/minimal_pacemaker.yml

@@ -1,7 +1,7 @@
 # This config deploys a minimal configuration but with pacemaker to
 # simulate a configuration close to HA without requiring 3 controllers
 
-# Define a controller node, a compute node, and a ceph node.
+# Define a controller node and a compute node
 overcloud_nodes:
   - name: control_0
     flavor: control

config/nodes/1ctlr_1comp_1ceph.yml

@@ -19,8 +19,6 @@ node_count: 3
 # Tell tripleo which nodes to deploy.
 topology: >-
   --ceph-storage-scale 1
-  -e {{overcloud_templates_path}}/environments/storage-environment.yaml
 
 network_isolation: true
 network_isolation_type: 'single-nic-vlans'
-