From 041251d473a55567992adb463174103f9c6200c2 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Wed, 11 Apr 2018 16:13:29 +0200
Subject: [PATCH] Switch remaining env files to containers defaults

Mark regular non-containerized services with FIXME
to be switched, once it is containerized

Do not mark yet an external/backend/plugin/host-config
related puppet services templates with that FIXME

Mark puppet/services/ceph- related templates as TODO
switch it to containerized ceph-ansible eventually, maybe.

Change-Id: Ib9fbad05eeb57dc641499fbf411cb5870da7a8e9
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---
 environments/auditd.yaml                               |  1 +
 environments/cavium-liquidio.yaml                      |  3 ++-
 environments/cinder-backup.yaml                        |  4 ++--
 environments/collectd-environment.yaml                 | 10 +++++-----
 environments/compute-instanceha.yaml                   |  4 +++-
 environments/docker-ha.yaml                            |  2 ++
 environments/docker-uc-light.yaml                      |  2 ++
 environments/docker.yaml                               |  2 ++
 environments/enable-internal-tls.yaml                  |  2 ++
 environments/enable_congress.yaml                      |  2 +-
 environments/enable_tacker.yaml                        |  2 +-
 environments/enable_tempest.yaml                       |  2 +-
 environments/logging-environment.yaml                  |  2 +-
 environments/manila-cephfsnative-config.yaml           |  6 +++---
 environments/manila-isilon-config.yaml                 |  6 +++---
 environments/manila-netapp-config.yaml                 |  6 +++---
 environments/manila-unity-config.yaml                  |  6 +++---
 environments/manila-vmax-config.yaml                   |  6 +++---
 environments/manila-vnx-config.yaml                    |  6 +++---
 environments/monitoring-environment.yaml               |  2 +-
 environments/neutron-bgpvpn-bagpipe.yaml               |  3 ++-
 environments/neutron-bgpvpn-opendaylight.yaml          |  2 +-
 environments/neutron-bgpvpn.yaml                       |  2 +-
 environments/neutron-l2gw-opendaylight.yaml            |  2 +-
 environments/neutron-l2gw.yaml                         |  3 ++-
 environments/neutron-linuxbridge.yaml                  |  1 +
 environments/neutron-ml2-bigswitch.yaml                |  1 +
 environments/neutron-ml2-ovn-dvr-ha.yaml               |  6 +++---
 environments/neutron-ml2-ovn-dvr.yaml                  |  6 +++---
 environments/neutron-ml2-ovn-ha.yaml                   |  8 ++++----
 environments/neutron-ml2-ovn-hw-offload.yaml           |  6 +++---
 environments/neutron-ml2-ovn.yaml                      |  8 ++++----
 environments/neutron-ml2-vpp.yaml                      |  4 +++-
 environments/neutron-opendaylight-hw-offload.yaml      |  3 ++-
 environments/neutron-opendaylight-sriov.yaml           |  4 +++-
 environments/neutron-opendaylight.yaml                 |  4 +++-
 environments/neutron-ovs-dpdk.yaml                     |  2 +-
 environments/neutron-ovs-dvr.yaml                      |  3 ++-
 environments/neutron-sfc-opendaylight.yaml             |  4 +++-
 environments/neutron-sfc.yaml                          |  1 +
 environments/neutron-sriov.yaml                        |  2 +-
 environments/nonha-arch.yaml                           | 10 +++++-----
 .../services/neutron-opendaylight-hw-offload.yaml      |  1 +
 environments/services/neutron-opendaylight.yaml        |  3 ++-
 environments/services/ptp.yaml                         |  1 +
 environments/services/vpp.yaml                         |  1 +
 .../veritas-hyperscale/veritas-hyperscale-config.yaml  |  1 +
 overcloud-resource-registry-puppet.j2.yaml             |  8 +++++---
 sample-env-generator/ssl.yaml                          |  2 ++
 49 files changed, 107 insertions(+), 71 deletions(-)

diff --git a/environments/auditd.yaml b/environments/auditd.yaml
index b358c98a47..a4f28f3fd4 100644
--- a/environments/auditd.yaml
+++ b/environments/auditd.yaml
@@ -1,4 +1,5 @@
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::AuditD: ../puppet/services/auditd.yaml
 
 parameter_defaults:
diff --git a/environments/cavium-liquidio.yaml b/environments/cavium-liquidio.yaml
index fe2c05a353..facc4bae0d 100644
--- a/environments/cavium-liquidio.yaml
+++ b/environments/cavium-liquidio.yaml
@@ -1,6 +1,7 @@
 resource_registry:
+   # FIXME(bogdando): switch it, once it is containerized
    OS::TripleO::Services::LiquidioCompute:  ../puppet/services/liquidio-compute-config.yaml
-   OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/neutron-metadata.yaml
+   OS::TripleO::Services::NeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
 
 parameter_defaults:
    LiquidioSriovVfNum: 4
diff --git a/environments/cinder-backup.yaml b/environments/cinder-backup.yaml
index f01fcbd9a1..60845e6a5f 100644
--- a/environments/cinder-backup.yaml
+++ b/environments/cinder-backup.yaml
@@ -1,4 +1,4 @@
 resource_registry:
-  OS::TripleO::Services::CinderBackup: ../puppet/services/pacemaker/cinder-backup.yaml
+  OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml
   # For non-pcmk managed implementation
-  # OS::TripleO::Services::CinderBackup: ../puppet/services/cinder-backup.yaml
\ No newline at end of file
+  # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml
diff --git a/environments/collectd-environment.yaml b/environments/collectd-environment.yaml
index e40aedf0a0..b221b666d3 100644
--- a/environments/collectd-environment.yaml
+++ b/environments/collectd-environment.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Services::Collectd: ../puppet/services/metrics/collectd.yaml
+  OS::TripleO::Services::Collectd: ../docker/services/collectd.yaml
 
 # parameter_defaults:
 #
@@ -8,9 +8,9 @@ resource_registry:
 #
 ################
 #### Other config parameters, the values shown here are the defaults
-################ 
+################
 #
-#   CollectdServerPort: 25826 
+#   CollectdServerPort: 25826
 #   CollectdSecurityLevel: None
 #
 ################
@@ -21,7 +21,7 @@ resource_registry:
 #   CollectdUsername: user
 #   CollectdPassword: password
 #
-## CollectdDefaultPlugins, These are the default plugins used by collectd 
+## CollectdDefaultPlugins, These are the default plugins used by collectd
 #
 #   CollectdDefaultPlugins:
 #     - disk
@@ -30,7 +30,7 @@ resource_registry:
 #     - memory
 #     - processes
 #     - tcpconns
-# 
+#
 ## Extra plugins can be enabled by the CollectdExtraPlugins parameter:
 ## All the plugins availables are:
 #
diff --git a/environments/compute-instanceha.yaml b/environments/compute-instanceha.yaml
index 21475b5988..926c5f5025 100644
--- a/environments/compute-instanceha.yaml
+++ b/environments/compute-instanceha.yaml
@@ -1,8 +1,10 @@
 # An environment which enables instance HA
-# Needs to be combined with environments/puppet-pacemaker.yaml
+# Needs to be combined with environments/services-baremetal/puppet-pacemaker.yaml
+# or environments/docker-ha.yaml
 # The ComputeInstanceHA *and* PacemakerRemote services need to be added
 # to your Compute role
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::ComputeInstanceHA: ../puppet/services/pacemaker/compute-instanceha.yaml
 
 parameter_defaults:
diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 065ef2b7a9..f5f09bf910 100644
--- a/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@ -3,7 +3,9 @@
 # ...deploy..-e docker.yaml -e docker-ha.yaml
 resource_registry:
   # Pacemaker runs on the host
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
   OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
diff --git a/environments/docker-uc-light.yaml b/environments/docker-uc-light.yaml
index 7c3b0fb955..07c5b6f0e1 100644
--- a/environments/docker-uc-light.yaml
+++ b/environments/docker-uc-light.yaml
@@ -2,6 +2,8 @@
 resource_registry:
   OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
+  # FIXME(bogdando): can not be switched yet due to puppet-base issues
+  # see https://review.openstack.org/#/c/563443
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::ContainersLogrotateCrond: ../docker/services/logrotate-crond.yaml
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 4468dbae65..bf6f5e8d45 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -1,6 +1,8 @@
 resource_registry:
   OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
+  # FIXME(bogdando): can not be switched yet due to puppet-base issues
+  # see https://review.openstack.org/#/c/563443
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
 
   #NOTE (dprince) add roles to be docker enabled as we support them
diff --git a/environments/enable-internal-tls.yaml b/environments/enable-internal-tls.yaml
index e85185d67e..9a9e565a9c 100644
--- a/environments/enable-internal-tls.yaml
+++ b/environments/enable-internal-tls.yaml
@@ -13,11 +13,13 @@ parameter_defaults:
     ipa_enroll: True
 
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::CertmongerUser: ../puppet/services/certmonger-user.yaml
 
   OS::TripleO::Services::HAProxyInternalTLS: ../puppet/services/haproxy-internal-tls-certmonger.yaml
 
   # We use apache as a TLS proxy
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::TLSProxyBase: ../puppet/services/apache.yaml
 
   # Creates nova metadata that will create the extra service principals per
diff --git a/environments/enable_congress.yaml b/environments/enable_congress.yaml
index 1eea7f5efc..bf551cabc8 100644
--- a/environments/enable_congress.yaml
+++ b/environments/enable_congress.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::Congress: ../puppet/services/congress.yaml
+  OS::TripleO::Services::Congress: ../docker/services/congress.yaml
diff --git a/environments/enable_tacker.yaml b/environments/enable_tacker.yaml
index 1f9eca0159..5079d1d4a4 100644
--- a/environments/enable_tacker.yaml
+++ b/environments/enable_tacker.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::Tacker: ../puppet/services/tacker.yaml
+  OS::TripleO::Services::Tacker: ../docker/services/tacker.yaml
diff --git a/environments/enable_tempest.yaml b/environments/enable_tempest.yaml
index 87ee94a62b..890ca22122 100644
--- a/environments/enable_tempest.yaml
+++ b/environments/enable_tempest.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::Tempest: ../puppet/services/tempest.yaml
+  OS::TripleO::Services::Tempest: ../docker/services/tempest.yaml
diff --git a/environments/logging-environment.yaml b/environments/logging-environment.yaml
index cb948bc488..16a34763e4 100644
--- a/environments/logging-environment.yaml
+++ b/environments/logging-environment.yaml
@@ -2,7 +2,7 @@
 ## logging agents
 
 resource_registry:
-  OS::TripleO::Services::Fluentd: ../puppet/services/logging/fluentd.yaml
+  OS::TripleO::Services::Fluentd: ../docker/services/fluentd.yaml
 
 #parameter_defaults:
 
diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml
index 7ceb1159b5..35012f5a84 100644
--- a/environments/manila-cephfsnative-config.yaml
+++ b/environments/manila-cephfsnative-config.yaml
@@ -1,10 +1,10 @@
 # A Heat environment file which can be used to enable a
 # a Manila CephFS Native driver backend.
 resource_registry:
-  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
-  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
   # Only manila-share is pacemaker managed:
-  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
   OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml
 
 
diff --git a/environments/manila-isilon-config.yaml b/environments/manila-isilon-config.yaml
index 809900c8e5..009ddb26d0 100644
--- a/environments/manila-isilon-config.yaml
+++ b/environments/manila-isilon-config.yaml
@@ -1,9 +1,9 @@
 # This environment file enables Manila with the Isilon backend.
 resource_registry:
-  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
-  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
   # Only manila-share is pacemaker managed:
-  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
   OS::TripleO::Services::ManilaBackendIsilon: ../puppet/services/manila-backend-isilon.yaml
 
 parameter_defaults:
diff --git a/environments/manila-netapp-config.yaml b/environments/manila-netapp-config.yaml
index 7eb149417f..a08a759c30 100644
--- a/environments/manila-netapp-config.yaml
+++ b/environments/manila-netapp-config.yaml
@@ -1,9 +1,9 @@
 # This environment file enables Manila with the Netapp backend.
 resource_registry:
-  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
-  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
   # Only manila-share is pacemaker managed:
-  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
   OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
 
 parameter_defaults:
diff --git a/environments/manila-unity-config.yaml b/environments/manila-unity-config.yaml
index 418404e1b1..555f94baa3 100644
--- a/environments/manila-unity-config.yaml
+++ b/environments/manila-unity-config.yaml
@@ -1,9 +1,9 @@
 # This environment file enables Manila with the Unity backend.
 resource_registry:
-  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
-  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
   # Only manila-share is pacemaker managed:
-  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
   OS::TripleO::Services::ManilaBackendUnity: ../puppet/services/manila-backend-unity.yaml
 
 parameter_defaults:
diff --git a/environments/manila-vmax-config.yaml b/environments/manila-vmax-config.yaml
index 8c9946cae1..fba37d114b 100644
--- a/environments/manila-vmax-config.yaml
+++ b/environments/manila-vmax-config.yaml
@@ -1,9 +1,9 @@
 # This environment file enables Manila with the VMAX backend.
 resource_registry:
-  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
-  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
   # Only manila-share is pacemaker managed:
-  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
   OS::TripleO::Services::ManilaBackendVMAX: ../puppet/services/manila-backend-vmax.yaml
 
 parameter_defaults:
diff --git a/environments/manila-vnx-config.yaml b/environments/manila-vnx-config.yaml
index 9a0ea59b7b..f9e8beb467 100644
--- a/environments/manila-vnx-config.yaml
+++ b/environments/manila-vnx-config.yaml
@@ -1,9 +1,9 @@
 # This environment file enables Manila with the VNX backend.
 resource_registry:
-  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
-  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
   # Only manila-share is pacemaker managed:
-  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
   OS::TripleO::Services::ManilaBackendVNX: ../puppet/services/manila-backend-vnx.yaml
 
 parameter_defaults:
diff --git a/environments/monitoring-environment.yaml b/environments/monitoring-environment.yaml
index f4aa67a9b7..3aaacf9a19 100644
--- a/environments/monitoring-environment.yaml
+++ b/environments/monitoring-environment.yaml
@@ -1,7 +1,7 @@
 ## A Heat environment file which can be used to set up monitoring agents
 
 resource_registry:
-  OS::TripleO::Services::SensuClient: ../puppet/services/monitoring/sensu-client.yaml
+  OS::TripleO::Services::SensuClient: ../docker/services/sensu-client.yaml
 
 #parameter_defaults:
 #  MonitoringRabbitHost: 10.10.10.10
diff --git a/environments/neutron-bgpvpn-bagpipe.yaml b/environments/neutron-bgpvpn-bagpipe.yaml
index 1812be9def..8264aa2ac8 100644
--- a/environments/neutron-bgpvpn-bagpipe.yaml
+++ b/environments/neutron-bgpvpn-bagpipe.yaml
@@ -7,7 +7,8 @@
 # in OpenVSwitch.
 #
 resource_registry:
-  OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
+  OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::NeutronBgpVpnBagpipe: ../puppet/services/neutron-bgpvpn-bagpipe.yaml
 
 parameter_defaults:
diff --git a/environments/neutron-bgpvpn-opendaylight.yaml b/environments/neutron-bgpvpn-opendaylight.yaml
index d455f6bd67..dc1fce038a 100644
--- a/environments/neutron-bgpvpn-opendaylight.yaml
+++ b/environments/neutron-bgpvpn-opendaylight.yaml
@@ -5,7 +5,7 @@
 #
 # - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
 resource_registry:
-  OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
+  OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml
 
 parameter_defaults:
   NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn'
diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml
index 7bc2d90df8..6d4befb1de 100644
--- a/environments/neutron-bgpvpn.yaml
+++ b/environments/neutron-bgpvpn.yaml
@@ -9,7 +9,7 @@
 # - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
 # - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default
 resource_registry:
-  OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
+  OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml
 
 parameter_defaults:
   NeutronServicePlugins: 'router,bgpvpn'
diff --git a/environments/neutron-l2gw-opendaylight.yaml b/environments/neutron-l2gw-opendaylight.yaml
index 528b8c51a5..5798ef6d84 100644
--- a/environments/neutron-l2gw-opendaylight.yaml
+++ b/environments/neutron-l2gw-opendaylight.yaml
@@ -5,7 +5,7 @@
 #
 # - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
 resource_registry:
-  OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml
+  OS::TripleO::Services::NeutronL2gwApi: ../docker/services/neutron-l2gw-api.yaml
 
 parameter_defaults:
   NeutronServicePlugins: "odl-router_v2,trunk,l2gw"
diff --git a/environments/neutron-l2gw.yaml b/environments/neutron-l2gw.yaml
index fbb4075847..b0c7781c7d 100644
--- a/environments/neutron-l2gw.yaml
+++ b/environments/neutron-l2gw.yaml
@@ -7,7 +7,8 @@
 # - L2 gateway agent: L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default
 # - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
 resource_registry:
-  OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml
+  OS::TripleO::Services::NeutronL2gwApi: ../docker/services/neutron-l2gw-api.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::NeutronL2gwAgent: ../puppet/services/neutron-l2gw-agent.yaml
 
 parameter_defaults:
diff --git a/environments/neutron-linuxbridge.yaml b/environments/neutron-linuxbridge.yaml
index c8045cc958..bdc84f87f4 100644
--- a/environments/neutron-linuxbridge.yaml
+++ b/environments/neutron-linuxbridge.yaml
@@ -2,6 +2,7 @@
 resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::NeutronLinuxbridgeAgent: ../puppet/services/neutron-linuxbridge-agent.yaml
 
 parameter_defaults:
diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml
index c0ba906ec2..91664c3306 100644
--- a/environments/neutron-ml2-bigswitch.yaml
+++ b/environments/neutron-ml2-bigswitch.yaml
@@ -3,6 +3,7 @@
 resource_registry:
   OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
   OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::NeutronBigswitchAgent: ../puppet/services/neutron-bigswitch-agent.yaml
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
diff --git a/environments/neutron-ml2-ovn-dvr-ha.yaml b/environments/neutron-ml2-ovn-dvr-ha.yaml
index c21ba3c89f..7568d56f47 100644
--- a/environments/neutron-ml2-ovn-dvr-ha.yaml
+++ b/environments/neutron-ml2-ovn-dvr-ha.yaml
@@ -1,9 +1,9 @@
 # A Heat environment file which can be used to enable OVN
-# extensions, configured via puppet
+# extensions, configured via docker
 resource_registry:
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
-  OS::TripleO::Services::OVNController: ../puppet/services/ovn-controller.yaml
-  OS::TripleO::Services::OVNDBs: ../puppet/services/pacemaker/ovn-dbs.yaml
+  OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml
+  OS::TripleO::Services::OVNDBs: ../docker/services/pacemaker/ovn-dbs.yaml
 # Disabling Neutron services that overlap with OVN
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
diff --git a/environments/neutron-ml2-ovn-dvr.yaml b/environments/neutron-ml2-ovn-dvr.yaml
index 076d66d770..93f3116ed2 100644
--- a/environments/neutron-ml2-ovn-dvr.yaml
+++ b/environments/neutron-ml2-ovn-dvr.yaml
@@ -1,9 +1,9 @@
 # A Heat environment file which can be used to enable OVN
-# extensions, configured via puppet
+# extensions, configured via docker
 resource_registry:
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
-  OS::TripleO::Services::OVNController: ../puppet/services/ovn-controller.yaml
-  OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.yaml
+  OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml
+  OS::TripleO::Services::OVNDBs: ../docker/services/ovn-dbs.yaml
 # Disabling Neutron services that overlap with OVN
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
diff --git a/environments/neutron-ml2-ovn-ha.yaml b/environments/neutron-ml2-ovn-ha.yaml
index 7b1d68de82..a57d0fbf76 100644
--- a/environments/neutron-ml2-ovn-ha.yaml
+++ b/environments/neutron-ml2-ovn-ha.yaml
@@ -1,10 +1,10 @@
 # A Heat environment file which can be used to enable OVN
-# extensions, configured via puppet
+# extensions, configured via docker
 resource_registry:
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
-  OS::TripleO::Services::OVNController: ../puppet/services/ovn-controller.yaml
-  OS::TripleO::Services::OVNDBs: ../puppet/services/pacemaker/ovn-dbs.yaml
-  OS::TripleO::Services::OVNMetadataAgent: ../puppet/services/ovn-metadata.yaml
+  OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml
+  OS::TripleO::Services::OVNDBs: ../docker/services/pacemaker/ovn-dbs.yaml
+  OS::TripleO::Services::OVNMetadataAgent: ../docker/services/ovn-metadata.yaml
 # Disabling Neutron services that overlap with OVN
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
diff --git a/environments/neutron-ml2-ovn-hw-offload.yaml b/environments/neutron-ml2-ovn-hw-offload.yaml
index 831159fcd6..3d26db2304 100644
--- a/environments/neutron-ml2-ovn-hw-offload.yaml
+++ b/environments/neutron-ml2-ovn-hw-offload.yaml
@@ -2,8 +2,8 @@
 # extensions, configured via puppet
 resource_registry:
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
-  OS::TripleO::Services::OVNController: ../puppet/services/ovn-controller.yaml
-  OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.yaml
+  OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml
+  OS::TripleO::Services::OVNDBs: ../docker/services/ovn-dbs.yaml
   OS::TripleO::Services::NeutronSriovHostConfig: ../puppet/services/neutron-sriov-host-config.yaml
 # Disabling Neutron services that overlap with OVN
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
@@ -37,4 +37,4 @@ parameter_defaults:
     # In case of flat/vlan the physical_network should as configured in neutron.
     #NovaPCIPassthrough:
     #  - devname: "enp2s0f0"
-    #    physical_network: "datacentre"
\ No newline at end of file
+    #    physical_network: "datacentre"
diff --git a/environments/neutron-ml2-ovn.yaml b/environments/neutron-ml2-ovn.yaml
index 696329c767..9cb4f19967 100644
--- a/environments/neutron-ml2-ovn.yaml
+++ b/environments/neutron-ml2-ovn.yaml
@@ -1,10 +1,10 @@
 # A Heat environment file which can be used to enable OVN
-# extensions, configured via puppet
+# extensions, configured via docker
 resource_registry:
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
-  OS::TripleO::Services::OVNController: ../puppet/services/ovn-controller.yaml
-  OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.yaml
-  OS::TripleO::Services::OVNMetadataAgent: ../puppet/services/ovn-metadata.yaml
+  OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml
+  OS::TripleO::Services::OVNDBs: ../docker/services/ovn-dbs.yaml
+  OS::TripleO::Services::OVNMetadataAgent: ../docker/services/ovn-metadata.yaml
 # Disabling Neutron services that overlap with OVN
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml
index 1dec395c6c..c782cf94b2 100644
--- a/environments/neutron-ml2-vpp.yaml
+++ b/environments/neutron-ml2-vpp.yaml
@@ -3,8 +3,10 @@
 resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::NeutronVppAgent: ../puppet/services/neutron-vpp-agent.yaml
-  OS::TripleO::Services::Etcd: ../puppet/services/etcd.yaml
+  OS::TripleO::Services::Etcd: ../docker/services/etcd.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml
 
 parameter_defaults:
diff --git a/environments/neutron-opendaylight-hw-offload.yaml b/environments/neutron-opendaylight-hw-offload.yaml
index 8ac27ea754..45abc2ffc7 100644
--- a/environments/neutron-opendaylight-hw-offload.yaml
+++ b/environments/neutron-opendaylight-hw-offload.yaml
@@ -4,7 +4,8 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-odl.yaml
-  OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml
+  OS::TripleO::Services::OpenDaylightApi: ../docker/services/opendaylight-api.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronSriovHostConfig: ../puppet/services/neutron-sriov-host-config.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
diff --git a/environments/neutron-opendaylight-sriov.yaml b/environments/neutron-opendaylight-sriov.yaml
index 52924070bf..943dd028d3 100644
--- a/environments/neutron-opendaylight-sriov.yaml
+++ b/environments/neutron-opendaylight-sriov.yaml
@@ -1,7 +1,9 @@
 # A Heat environment that can be used to deploy OpenDaylight with SRIOV
 resource_registry:
+  # FIXME(bogdando): can not be switched yet due to puppet-base issues
+  # see https://review.openstack.org/#/c/563443
   OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-plugin-ml2.yaml
-  OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml
+  OS::TripleO::Services::NeutronSriovAgent: ../docker/services/neutron-sriov-agent.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml
index e9b1ac1146..f588e51a1c 100644
--- a/environments/neutron-opendaylight.yaml
+++ b/environments/neutron-opendaylight.yaml
@@ -3,8 +3,10 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-odl.yaml
-  OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml
+  OS::TripleO::Services::OpenDaylightApi: ../docker/services/opendaylight-api.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
 
diff --git a/environments/neutron-ovs-dpdk.yaml b/environments/neutron-ovs-dpdk.yaml
index 5cb2dea559..4dd6fd2ab5 100644
--- a/environments/neutron-ovs-dpdk.yaml
+++ b/environments/neutron-ovs-dpdk.yaml
@@ -1,7 +1,7 @@
 # A Heat environment that can be used to deploy DPDK with OVS
 # Deploying DPDK requires enabling hugepages for the overcloud nodes
 resource_registry:
-  OS::TripleO::Services::ComputeNeutronOvsDpdk: ../puppet/services/neutron-ovs-dpdk-agent.yaml
+  OS::TripleO::Services::ComputeNeutronOvsDpdk: ../docker/services/neutron-ovs-dpdk-agent.yaml
 
 parameter_defaults:
   NeutronDatapathType: "netdev"
diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml
index 973cbe1612..f4522ed5ea 100644
--- a/environments/neutron-ovs-dvr.yaml
+++ b/environments/neutron-ovs-dvr.yaml
@@ -2,8 +2,9 @@
 # This works by configuring L3 and Metadata agents on the
 # compute nodes.
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::ComputeNeutronL3Agent: ../puppet/services/neutron-l3-compute-dvr.yaml
-  OS::TripleO::Services::ComputeNeutronMetadataAgent: ../puppet/services/neutron-metadata.yaml
+  OS::TripleO::Services::ComputeNeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
 
   # With DVR enabled, the Compute nodes also need the br-ex bridge to be
   # connected to a physical network.
diff --git a/environments/neutron-sfc-opendaylight.yaml b/environments/neutron-sfc-opendaylight.yaml
index bfdd19312f..9839cc40f3 100644
--- a/environments/neutron-sfc-opendaylight.yaml
+++ b/environments/neutron-sfc-opendaylight.yaml
@@ -1,11 +1,13 @@
 # A Heat environment file that can be used to deploy Neutron SFC service with OpenDaylight
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::NeutronSfcApi: ../puppet/services/neutron-sfc-api.yaml
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-odl.yaml
-  OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml
+  OS::TripleO::Services::OpenDaylightApi: ../docker/services/opendaylight-api.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
 
diff --git a/environments/neutron-sfc.yaml b/environments/neutron-sfc.yaml
index 2240f53fb4..4bca06d337 100644
--- a/environments/neutron-sfc.yaml
+++ b/environments/neutron-sfc.yaml
@@ -1,5 +1,6 @@
 # A Heat environment file that can be used to deploy Neutron SFC service
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::NeutronSfcApi: ../puppet/services/neutron-sfc-api.yaml
 
 parameter_defaults:
diff --git a/environments/neutron-sriov.yaml b/environments/neutron-sriov.yaml
index 26c28d28ee..323ce8d952 100755
--- a/environments/neutron-sriov.yaml
+++ b/environments/neutron-sriov.yaml
@@ -1,6 +1,6 @@
 ## A Heat environment that can be used to deploy SR-IOV
 resource_registry:
-  OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml
+  OS::TripleO::Services::NeutronSriovAgent: ../docker/services/neutron-sriov-agent.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']
diff --git a/environments/nonha-arch.yaml b/environments/nonha-arch.yaml
index 7fdcc10031..605ce05d34 100644
--- a/environments/nonha-arch.yaml
+++ b/environments/nonha-arch.yaml
@@ -5,11 +5,11 @@ resource_registry:
   OS::TripleO::Tasks::ControllerPostConfig:  OS::Heat::None
   OS::TripleO::Tasks::ControllerPostPuppetRestart:  OS::Heat::None
 
-  OS::TripleO::Services::CinderVolume: ../puppet/services/cinder-volume.yaml
-  OS::TripleO::Services::RabbitMQ: ../puppet/services/rabbitmq.yaml
-  OS::TripleO::Services::HAproxy: ../puppet/services/haproxy.yaml
-  OS::TripleO::Services::Redis: ../puppet/services/database/redis.yaml
-  OS::TripleO::Services::MySQL: ../puppet/services/database/mysql.yaml
+  OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
+  OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
+  OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
+  OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
+  OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   OS::TripleO::Services::Pacemaker: OS::Heat::None
   OS::TripleO::Services::PacemakerRemote: OS::Heat::None
diff --git a/environments/services/neutron-opendaylight-hw-offload.yaml b/environments/services/neutron-opendaylight-hw-offload.yaml
index 7067a51e4e..36fa749c69 100644
--- a/environments/services/neutron-opendaylight-hw-offload.yaml
+++ b/environments/services/neutron-opendaylight-hw-offload.yaml
@@ -5,6 +5,7 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: ../../puppet/services/neutron-plugin-ml2-odl.yaml
   OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
diff --git a/environments/services/neutron-opendaylight.yaml b/environments/services/neutron-opendaylight.yaml
index cde1883c0e..8ace95a97e 100644
--- a/environments/services/neutron-opendaylight.yaml
+++ b/environments/services/neutron-opendaylight.yaml
@@ -4,6 +4,7 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
   OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
   OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml
@@ -13,4 +14,4 @@ parameter_defaults:
   NeutronPluginExtensions: 'port_security'
   NeutronMechanismDrivers: 'opendaylight_v2'
   NeutronServicePlugins: 'odl-router_v2,trunk'
-  OpenDaylightLogMechanism: 'console'
\ No newline at end of file
+  OpenDaylightLogMechanism: 'console'
diff --git a/environments/services/ptp.yaml b/environments/services/ptp.yaml
index c38af0cb86..6dfb00ff8e 100644
--- a/environments/services/ptp.yaml
+++ b/environments/services/ptp.yaml
@@ -2,6 +2,7 @@
 
 resource_registry:
   OS::TripleO::Services::Ntp: OS::Heat::None
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::Ptp: ../../puppet/services/time/ptp.yaml
 
 parameter_defaults:
diff --git a/environments/services/vpp.yaml b/environments/services/vpp.yaml
index 9bad70f806..1844c55a5a 100644
--- a/environments/services/vpp.yaml
+++ b/environments/services/vpp.yaml
@@ -1,4 +1,5 @@
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::Vpp: ../../puppet/services/vpp.yaml
 
 #parameter_defaults:
diff --git a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml b/environments/veritas-hyperscale/veritas-hyperscale-config.yaml
index f66335397c..ef67e22f8c 100644
--- a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml
+++ b/environments/veritas-hyperscale/veritas-hyperscale-config.yaml
@@ -15,6 +15,7 @@
 # A Heat environment file which can be used to install
 # Veritas HyperScale packages for controller.
 resource_registry:
+  # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::VRTSHyperScale: ../../puppet/services/veritas-hyperscale-controller.yaml
 
 parameter_defaults:
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 25fc8776a9..86b25bc30d 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -119,7 +119,7 @@ resource_registry:
   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::BlockStorageCinderVolume: docker/services/cinder-volume.yaml
   OS::TripleO::Services::Congress: OS::Heat::None
   OS::TripleO::Services::Keystone: docker/services/keystone.yaml
   OS::TripleO::Services::GlanceApi: docker/services/glance-api.yaml
@@ -163,7 +163,7 @@ resource_registry:
 
   OS::TripleO::Services::NeutronCorePluginMLNXSDN: puppet/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml
   OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml
-  OS::TripleO::Services::NeutronCorePluginVTS: puppet/services/neutron-plugin-ml2-cisco-vts.yaml
+  OS::TripleO::Services::NeutronCorePluginVTS: docker/services/neutron-plugin-ml2-cisco-vts.yaml
   OS::TripleO::Services::NeutronOvsAgent: docker/services/neutron-ovs-agent.yaml
   OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: docker/services/neutron-ovs-agent.yaml
@@ -180,7 +180,7 @@ resource_registry:
   OS::TripleO::Services::HAProxyPublicTLS: OS::Heat::None
   OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None
   OS::TripleO::Services::Iscsid: docker/services/iscsid.yaml
-  OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
+  OS::TripleO::Services::Keepalived: docker/services/keepalived.yaml
   OS::TripleO::Services::Memcached: docker/services/memcached.yaml
   OS::TripleO::Services::SaharaApi: OS::Heat::None
   OS::TripleO::Services::SaharaEngine: OS::Heat::None
@@ -336,6 +336,8 @@ resource_registry:
   OS::TripleO::Services::DesignateSink: OS::Heat::None
 
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
+  # FIXME(bogdando): can not be switched yet due to puppet-base issues
+  # see https://review.openstack.org/#/c/563443
   OS::TripleO::Docker::NeutronMl2PluginBase: puppet/services/neutron-plugin-ml2.yaml
   OS::TripleO::Services::Multipathd: docker/services/multipathd.yaml
 
diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml
index 5feaf17c27..0fbc313e37 100644
--- a/sample-env-generator/ssl.yaml
+++ b/sample-env-generator/ssl.yaml
@@ -49,9 +49,11 @@ environments:
 
             ipa_enroll: True
     resource_registry:
+      # FIXME(bogdando): switch it, once it is containerized
       OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml
       OS::TripleO::Services::HAProxyInternalTLS: ../../puppet/services/haproxy-internal-tls-certmonger.yaml
       # We use apache as a TLS proxy
+      # FIXME(bogdando): switch it, once it is containerized
       OS::TripleO::Services::TLSProxyBase: ../../puppet/services/apache.yaml
       # Creates nova metadata that will create the extra service principals per
       # node.