From bc876b0f2db150a0a1a1f00beb7d07445210d05f Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 13 Nov 2017 11:26:01 +0100 Subject: [PATCH] Fix featureset024 to deploy Ceph not in containers via puppet-ceph With change [1] we changed the default behavior of the storage-environment.yaml file to deploy Ceph in containers using ceph-ansible; featureset024 instead is not using containers, so we should update it to make it use puppet-ceph instead. 1. I1dea3b7665dc0da2ab30a89e077ba36cd36b05fd Change-Id: I444760bf168af466411746023523c1b681d0ccda Closes-Bug: #1731282 --- config/general_config/featureset024.yml | 1 + config/general_config/minimal_pacemaker.yml | 2 +- config/nodes/1ctlr_1comp_1ceph.yml | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/general_config/featureset024.yml b/config/general_config/featureset024.yml index 1b9b9a4b8..4c38005e7 100644 --- a/config/general_config/featureset024.yml +++ b/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 diff --git a/config/general_config/minimal_pacemaker.yml b/config/general_config/minimal_pacemaker.yml index f4d81ad8c..419383abb 100644 --- a/config/general_config/minimal_pacemaker.yml +++ b/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 diff --git a/config/nodes/1ctlr_1comp_1ceph.yml b/config/nodes/1ctlr_1comp_1ceph.yml index 047d07708..7cf35411e 100644 --- a/config/nodes/1ctlr_1comp_1ceph.yml +++ b/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' -