From 6db7153b342b8aad874f9b139f33a19269571a0e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 13 Jun 2022 16:57:25 +0900 Subject: [PATCH] Enable Horizon in CI Currently Horizon is not tested in any scenario jobs. This change fixes that and ensure deployment of Horizon is tested in standalone jobs. Currently TripleO supports the following dashboards so horizon is enabled in the jobs which have these components enabled. - Heat - Manila - Octavia Change-Id: Iac31bceedb8a06ed1add83ba3ce37a2151dd9348 --- ci/environments/scenario001-standalone.yaml | 2 +- ci/environments/scenario004-standalone.yaml | 2 +- ci/environments/scenario010-standalone.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index df5d51f3a6..7a45d5cfdf 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -20,6 +20,7 @@ resource_registry: OS::TripleO::Services::HeatApiCfn: ../../deployment/heat/heat-api-cfn-container-puppet.yaml OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml + OS::TripleO::Services::Horizon: ../../deployment/horizon/horizon-container-puppet.yaml OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml OS::TripleO::Services::Multipathd: ../../deployment/multipathd/multipathd-container-ansible.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -31,7 +32,6 @@ resource_registry: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::Horizon: OS::Heat::None parameter_defaults: NodeDataLookup: diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 1f05e99143..ac0ffd358d 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -4,7 +4,7 @@ resource_registry: OS::TripleO::Services::CinderScheduler: OS::Heat::None OS::TripleO::Services::CinderVolume: OS::Heat::None OS::TripleO::Services::Redis: OS::Heat::None - OS::TripleO::Services::Horizon: OS::Heat::None + OS::TripleO::Services::Horizon: ../../deployment/horizon/horizon-container-puppet.yaml OS::TripleO::Services::CephMgr: ../../deployment/cephadm/ceph-mgr.yaml OS::TripleO::Services::CephMon: ../../deployment/cephadm/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../../deployment/cephadm/ceph-osd.yaml diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml index c0bbef6527..de696bb2bc 100644 --- a/ci/environments/scenario010-standalone.yaml +++ b/ci/environments/scenario010-standalone.yaml @@ -7,7 +7,7 @@ resource_registry: OS::TripleO::Services::CinderBackup: OS::Heat::None OS::TripleO::Services::CinderScheduler: OS::Heat::None OS::TripleO::Services::CinderVolume: OS::Heat::None - OS::TripleO::Services::Horizon: OS::Heat::None + OS::TripleO::Services::Horizon: ../../deployment/horizon/horizon-container-puppet.yaml OS::TripleO::Services::OctaviaApi: ../../deployment/octavia/octavia-api-container-puppet.yaml OS::TripleO::Services::OctaviaDeploymentConfig: ../../deployment/octavia/octavia-deployment-config.yaml OS::TripleO::Services::OctaviaHealthManager: ../../deployment/octavia/octavia-health-manager-container-puppet.yaml