From 07ce5c4bae4f2b22e964276a313ff3866ab7691d Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Tue, 24 Oct 2017 15:48:16 -0400 Subject: [PATCH] Add undercloud cinder roles and environment files If enable_cinder is true in undercloud.conf, we will need to include these env files to setup cinder containers. Change-Id: I208347c52ac5ad24a54aade0be23a31f5bdd4249 --- environments/services-docker/undercloud-cinder.yaml | 4 ++++ overcloud-resource-registry-puppet.j2.yaml | 4 ++++ roles/Undercloud.yaml | 3 +++ roles_data_undercloud.yaml | 3 +++ 4 files changed, 14 insertions(+) create mode 100644 environments/services-docker/undercloud-cinder.yaml diff --git a/environments/services-docker/undercloud-cinder.yaml b/environments/services-docker/undercloud-cinder.yaml new file mode 100644 index 0000000000..ba70a478ce --- /dev/null +++ b/environments/services-docker/undercloud-cinder.yaml @@ -0,0 +1,4 @@ +resource_registry: + OS::TripleO::Services::UndercloudCinderApi: ../docker/services/cinder-api.yaml + OS::TripleO::Services::UndercloudCinderScheduler: ../docker/services/cinder-scheduler.yaml + OS::TripleO::Services::UndercloudCinderVolume: ../docker/services/cinder-volume.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 1095e764ee..ace549f83f 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -126,6 +126,10 @@ resource_registry: OS::TripleO::Services::CinderBackup: OS::Heat::None OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml + # undercloud cinder services + OS::TripleO::Services::UndercloudCinderApi: OS::Heat::None + OS::TripleO::Services::UndercloudCinderScheduler: OS::Heat::None + OS::TripleO::Services::UndercloudCinderVolume: OS::Heat::None OS::TripleO::Services::BlockStorageCinderVolume: puppet/services/cinder-volume.yaml OS::TripleO::Services::Congress: OS::Heat::None OS::TripleO::Services::Keystone: puppet/services/keystone.yaml diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index dc352557aa..1e05b523d2 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -57,4 +57,7 @@ - OS::TripleO::Services::UndercloudGnocchiMetricd - OS::TripleO::Services::UndercloudGnocchiStatsd - OS::TripleO::Services::UndercloudPankoApi + - OS::TripleO::Services::UndercloudCinderApi + - OS::TripleO::Services::UndercloudCinderScheduler + - OS::TripleO::Services::UndercloudCinderVolume - OS::TripleO::Services::Zaqar diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 074cbbb746..890610ffd1 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -60,5 +60,8 @@ - OS::TripleO::Services::UndercloudGnocchiMetricd - OS::TripleO::Services::UndercloudGnocchiStatsd - OS::TripleO::Services::UndercloudPankoApi + - OS::TripleO::Services::UndercloudCinderApi + - OS::TripleO::Services::UndercloudCinderScheduler + - OS::TripleO::Services::UndercloudCinderVolume - OS::TripleO::Services::Zaqar