diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index c176b892fd..239561cc69 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -9,7 +9,6 @@ resource_registry: OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml - OS::TripleO::Services::CephGrafana: ../../deployment/ceph-ansible/ceph-grafana.yaml OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml OS::TripleO::Services::GnocchiApi: ../../deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -70,9 +69,6 @@ parameter_defaults: wal_vg: ceph_vg CephPoolDefaultPgNum: 32 CephPoolDefaultSize: 1 - CephEnableDashboard: true - CephDashboardPort: 8445 - GrafanaDashboardPort: 3200 CephAnsibleRepo: "tripleo-centos-ceph-nautilus" CinderRbdExtraPools: altrbd,pool2,pool3 CephPools: diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 16244e7aa9..33f6201971 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -8,6 +8,7 @@ resource_registry: OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml + OS::TripleO::Services::CephGrafana: ../../deployment/ceph-ansible/ceph-grafana.yaml OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml @@ -45,6 +46,9 @@ parameter_defaults: wal_vg: ceph_vg CephPoolDefaultPgNum: 32 CephPoolDefaultSize: 1 + CephEnableDashboard: true + CephDashboardPort: 8445 + GrafanaDashboardPort: 3200 CephAnsibleExtraConfig: centos_package_dependencies: [] ceph_osd_docker_memory_limit: '1g'