From 2f9ed49748f00230417b53bcde1bc0a05476acb8 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Thu, 29 Jun 2017 18:50:36 +0200 Subject: [PATCH] Reintroduce containerized Cinder Change-Id: Ied8429be0eb16e4d775d1dfe0c2f0f31f9e01e23 Closes-Bug: #1700140 --- environments/docker-ha.yaml | 4 +--- environments/docker.yaml | 10 ++++------ environments/services-docker/cinder-backup.yaml | 4 ++++ 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 environments/services-docker/cinder-backup.yaml diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml index 1e25a35732..88bcab9017 100644 --- a/environments/docker-ha.yaml +++ b/environments/docker-ha.yaml @@ -12,9 +12,7 @@ resource_registry: OS::TripleO::Services::Keepalived: OS::Heat::None # HA Containers managed by pacemaker - # FIXME: enable those Cinder services once their non-HA counterpart are enabled - # OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml - # OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml + OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml OS::TripleO::Services::Clustercheck: ../docker/services/pacemaker/clustercheck.yaml OS::TripleO::Services::HAproxy: ../docker/services/pacemaker/haproxy.yaml OS::TripleO::Services::MySQL: ../docker/services/pacemaker/database/mysql.yaml diff --git a/environments/docker.yaml b/environments/docker.yaml index 4e61cb57a0..f7b75a4652 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -53,12 +53,10 @@ resource_registry: OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml OS::TripleO::Services::ContainersLogrotateCrond: ../docker/services/logrotate-crond.yaml - # FIXME: Had to remove these to unblock containers CI. They should be put back when fixed. - # OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml - # OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml - # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml - # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml - # + OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml + OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml + OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml + # If SR-IOV is enabled on the compute nodes, it will need the SR-IOV # host configuration. OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None diff --git a/environments/services-docker/cinder-backup.yaml b/environments/services-docker/cinder-backup.yaml new file mode 100644 index 0000000000..60845e6a5f --- /dev/null +++ b/environments/services-docker/cinder-backup.yaml @@ -0,0 +1,4 @@ +resource_registry: + OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml + # For non-pcmk managed implementation + # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml