16 files changed, 310 insertions, 196 deletions
diff --git a/environments/ceph-ansible/ceph-mds.yaml b/environments/ceph-ansible/ceph-mds.yaml
new file mode 100644
index 00000000..0834269c
--- /dev/null
+++ b/environments/ceph-ansible/ceph-mds.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
diff --git a/environments/cinder-dellemc-unity-config.yaml b/environments/cinder-dellemc-unity-config.yaml
new file mode 100644
index 00000000..c67c91cb
--- /dev/null
+++ b/environments/cinder-dellemc-unity-config.yaml
@@ -0,0 +1,14 @@
+# A Heat environment file which can be used to enable a
+# Cinder Dell EMC Unity backend, configured via puppet
+resource_registry:
+  OS::TripleO::Services::CinderBackendDellEMCUnity: ../puppet/services/cinder-backend-dellemc-unity.yaml
+
+parameter_defaults:
+  CinderEnableDellEMCUnityBackend: true
+  CinderDellEMCUnityBackendName: 'tripleo_dellemc_unity'
+  CinderDellEMCUnitySanIp: ''
+  CinderDellEMCUnitySanLogin: 'Admin'
+  CinderDellEMCUnitySanPassword: ''
+  CinderDellEMCUnityStorageProtocol: 'iSCSI'
+  CinderDellEMCUnityIoPorts: ''
+  CinderDellEMCUnityStoragePoolNames: ''
diff --git a/environments/composable-roles/monolithic-ha.yaml b/environments/composable-roles/monolithic-ha.yaml
new file mode 100644
index 00000000..a1dcd7bf
--- /dev/null
+++ b/environments/composable-roles/monolithic-ha.yaml
@@ -0,0 +1,59 @@
+# *******************************************************************
+# This file was created automatically by the sample environment
+# generator. Developers should use `tox -e genconfig` to update it.
+# Users are recommended to make changes to a copy of the file instead
+# of the original, if any customizations are needed.
+# *******************************************************************
+# title: Monolithic Controller HA deployment
+# description: |
+#   A Heat environment that can be used to deploy controller and compute
+#   services in an HA configuration with SSL everywhere and network
+#   isolation.
+#   This should be used with a roles_data.yaml containing the Controller,
+#   Compute and CephStorage roles.
+#   openstack overcloud roles generate -o ~/roles_data.yaml Controller Compute CephStorage
+parameter_defaults:
+  # Number of CephStorage nodes to deploy
+  # Type: number
+  CephStorageCount: 1
+
+  # Format for CephStorage node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  CephStorageHostnameFormat: '%stackname%-cephstorage-%index%'
+
+  # Number of Compute nodes to deploy
+  # Type: number
+  ComputeCount: 3
+
+  # Format for Compute node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  ComputeHostnameFormat: '%stackname%-novacompute-%index%'
+
+  # Number of Controller nodes to deploy
+  # Type: number
+  ControllerCount: 3
+
+  # Format for Controller node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  ControllerHostnameFormat: '%stackname%-controller-%index%'
+
+  # DNS servers to use for the Overcloud
+  # Type: comma_delimited_list
+  DnsServers: ['8.8.8.8', '8,8.4.4']
+
+  # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default.
+  # Type: comma_delimited_list
+  NtpServer: ['pool.ntp.org']
+
+  # Name of the flavor for Ceph nodes
+  # Type: string
+  OvercloudCephStorageFlavor: ceph
+
+  # Name of the flavor for Compute nodes
+  # Type: string
+  OvercloudComputeFlavor: compute
+
+  # Name of the flavor for Controller nodes
+  # Type: string
+  OvercloudControllerFlavor: control
+
diff --git a/environments/composable-roles/monolithic-nonha.yaml b/environments/composable-roles/monolithic-nonha.yaml
new file mode 100644
index 00000000..f49ddf2a
--- /dev/null
+++ b/environments/composable-roles/monolithic-nonha.yaml
@@ -0,0 +1,59 @@
+# *******************************************************************
+# This file was created automatically by the sample environment
+# generator. Developers should use `tox -e genconfig` to update it.
+# Users are recommended to make changes to a copy of the file instead
+# of the original, if any customizations are needed.
+# *******************************************************************
+# title: Monolithic Controller Non-HA deployment
+# description: |
+#   A Heat environment that can be used to deploy controller and compute
+#   services in an Non-HA configuration with SSL undercloud only and a
+#   flat network.
+#   This should be used with a roles_data.yaml containing the Controller,
+#   Compute and CephStorage roles.
+#   openstack overcloud roles generate -o ~/roles_data.yaml Controller Compute CephStorage
+parameter_defaults:
+  # Number of CephStorage nodes to deploy
+  # Type: number
+  CephStorageCount: 1
+
+  # Format for CephStorage node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  CephStorageHostnameFormat: '%stackname%-cephstorage-%index%'
+
+  # Number of Compute nodes to deploy
+  # Type: number
+  ComputeCount: 1
+
+  # Format for Compute node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  ComputeHostnameFormat: '%stackname%-novacompute-%index%'
+
+  # Number of Controller nodes to deploy
+  # Type: number
+  ControllerCount: 1
+
+  # Format for Controller node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  ControllerHostnameFormat: '%stackname%-controller-%index%'
+
+  # DNS servers to use for the Overcloud
+  # Type: comma_delimited_list
+  DnsServers: ['8.8.8.8', '8,8.4.4']
+
+  # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default.
+  # Type: comma_delimited_list
+  NtpServer: ['pool.ntp.org']
+
+  # Name of the flavor for Ceph nodes
+  # Type: string
+  OvercloudCephStorageFlavor: ceph
+
+  # Name of the flavor for Compute nodes
+  # Type: string
+  OvercloudComputeFlavor: compute
+
+  # Name of the flavor for Controller nodes
+  # Type: string
+  OvercloudControllerFlavor: control
+
diff --git a/environments/composable-roles/standalone.yaml b/environments/composable-roles/standalone.yaml
new file mode 100644
index 00000000..3305c9ed
--- /dev/null
+++ b/environments/composable-roles/standalone.yaml
@@ -0,0 +1,84 @@
+# *******************************************************************
+# This file was created automatically by the sample environment
+# generator. Developers should use `tox -e genconfig` to update it.
+# Users are recommended to make changes to a copy of the file instead
+# of the original, if any customizations are needed.
+# *******************************************************************
+# title: Controller HA deployment with standalone Database, Messaging and Networker nodes.
+# description: |
+#   A Heat environment that can be used to deploy controller, database,
+#   messaging, networker and compute services in an HA configuration with SSL
+#   everywhere and network isolation.
+#   This should be used with a roles_data.yaml containing the
+#   ControllerOpenstack, Database, Messaging, Networker, Compute and
+#   CephStorage roles.
+#   openstack overcloud roles generate -o ~/roles_data.yaml ControllerOpenstack Database Messaging Networker Compute CephStorage
+parameter_defaults:
+  # Number of CephStorage nodes to deploy
+  # Type: number
+  CephStorageCount: 1
+
+  # Format for CephStorage node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  CephStorageHostnameFormat: '%stackname%-cephstorage-%index%'
+
+  # Number of Compute nodes to deploy
+  # Type: number
+  ComputeCount: 1
+
+  # Format for Compute node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  ComputeHostnameFormat: '%stackname%-novacompute-%index%'
+
+  # Number of Controller nodes to deploy
+  # Type: number
+  ControllerCount: 3
+
+  # Format for Controller node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  ControllerHostnameFormat: '%stackname%-controller-%index%'
+
+  # Number of Database nodes
+  # Type: number
+  DatabaseCount: 3
+
+  # DNS servers to use for the Overcloud
+  # Type: comma_delimited_list
+  DnsServers: ['8.8.8.8', '8,8.4.4']
+
+  # Number of Messaging nodes
+  # Type: number
+  MessagingCount: 3
+
+  # Number of Networker nodes
+  # Type: number
+  NetworkerCount: 2
+
+  # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default.
+  # Type: comma_delimited_list
+  NtpServer: ['pool.ntp.org']
+
+  # Name of the flavor for Ceph nodes
+  # Type: string
+  OvercloudCephStorageFlavor: ceph
+
+  # Name of the flavor for Compute nodes
+  # Type: string
+  OvercloudComputeFlavor: compute
+
+  # Name of the flavor for Controller nodes
+  # Type: string
+  OvercloudControllerFlavor: control
+
+  # Name of the flavor for Database nodes
+  # Type: string
+  OvercloudDatabaseFlavor: db
+
+  # Name of the flavor for Messaging nodes
+  # Type: string
+  OvercloudMessagingFlavor: messaging
+
+  # Name of the flavor for Networker nodes
+  # Type: string
+  OvercloudNetworkerFlavor: networker
+
diff --git a/environments/contrail/roles_data_contrail.yaml b/environments/contrail/roles_data_contrail.yaml
index eae809a5..dd1c5455 100644
--- a/environments/contrail/roles_data_contrail.yaml
+++ b/environments/contrail/roles_data_contrail.yaml
@@ -66,6 +66,7 @@
     - OS::TripleO::Services::NovaVncProxy
     - OS::TripleO::Services::Ec2Api
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::SwiftProxy
     - OS::TripleO::Services::SwiftStorage
     - OS::TripleO::Services::SwiftRingBuilder
@@ -122,6 +123,7 @@
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::NovaCompute
@@ -149,6 +151,7 @@
     - OS::TripleO::Services::BlockStorageCinderVolume
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
@@ -165,6 +168,7 @@
     - OS::TripleO::Services::CertmongerUser
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::SwiftStorage
     - OS::TripleO::Services::SwiftRingBuilder
     - OS::TripleO::Services::Snmp
@@ -184,6 +188,7 @@
     - OS::TripleO::Services::CephOSD
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timezone
@@ -203,6 +208,7 @@
     - OS::TripleO::Services::ContrailWebUI
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::TripleoPackages
@@ -217,6 +223,7 @@
     - OS::TripleO::Services::ContrailAnalytics
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::TripleoPackages
@@ -230,6 +237,7 @@
     - OS::TripleO::Services::ContrailAnalyticsDatabase
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::TripleoPackages
@@ -243,6 +251,7 @@
     - OS::TripleO::Services::ContrailTsn
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::TripleoPackages
@@ -256,6 +265,7 @@
     - OS::TripleO::Services::ContrailTsn
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::TripleoPackages
diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml
deleted file mode 100644
index 47f8e528..00000000
--- a/environments/docker-centos-tripleoupstream.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-# Generated with the following on 2017-07-12T11:40:50.219622
-#
-#   overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml
-#
-
-parameter_defaults:
-  DockerAodhApiImage: tripleoupstream/centos-binary-aodh-api:latest
-  DockerAodhConfigImage: tripleoupstream/centos-binary-aodh-api:latest
-  DockerAodhEvaluatorImage: tripleoupstream/centos-binary-aodh-evaluator:latest
-  DockerAodhListenerImage: tripleoupstream/centos-binary-aodh-listener:latest
-  DockerAodhNotifierImage: tripleoupstream/centos-binary-aodh-notifier:latest
-  DockerCeilometerCentralImage: tripleoupstream/centos-binary-ceilometer-central:latest
-  DockerCeilometerComputeImage: tripleoupstream/centos-binary-ceilometer-compute:latest
-  DockerCeilometerConfigImage: tripleoupstream/centos-binary-ceilometer-central:latest
-  DockerCeilometerIpmiImage: tripleoupstream/centos-binary-ceilometer-ipmi:latest
-  DockerCeilometerNotificationImage: tripleoupstream/centos-binary-ceilometer-notification:latest
-  DockerCinderApiImage: tripleoupstream/centos-binary-cinder-api:latest
-  DockerCinderBackupImage: tripleoupstream/centos-binary-cinder-backup:latest
-  DockerCinderConfigImage: tripleoupstream/centos-binary-cinder-api:latest
-  DockerCinderSchedulerImage: tripleoupstream/centos-binary-cinder-scheduler:latest
-  DockerCinderVolumeImage: tripleoupstream/centos-binary-cinder-volume:latest
-  DockerClustercheckConfigImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerClustercheckImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerCollectdConfigImage: tripleoupstream/centos-binary-collectd:latest
-  DockerCollectdImage: tripleoupstream/centos-binary-collectd:latest
-  DockerCongressApiImage: tripleoupstream/centos-binary-congress-api:latest
-  DockerCongressConfigImage: tripleoupstream/centos-binary-congress-api:latest
-  DockerEc2ApiConfigImage: tripleoupstream/centos-binary-ec2-api:latest
-  DockerEc2ApiImage: tripleoupstream/centos-binary-ec2-api:latest
-  DockerEtcdConfigImage: tripleoupstream/centos-binary-etcd:latest
-  DockerEtcdImage: tripleoupstream/centos-binary-etcd:latest
-  DockerGlanceApiConfigImage: tripleoupstream/centos-binary-glance-api:latest
-  DockerGlanceApiImage: tripleoupstream/centos-binary-glance-api:latest
-  DockerGnocchiApiImage: tripleoupstream/centos-binary-gnocchi-api:latest
-  DockerGnocchiConfigImage: tripleoupstream/centos-binary-gnocchi-api:latest
-  DockerGnocchiMetricdImage: tripleoupstream/centos-binary-gnocchi-metricd:latest
-  DockerGnocchiStatsdImage: tripleoupstream/centos-binary-gnocchi-statsd:latest
-  DockerHAProxyConfigImage: tripleoupstream/centos-binary-haproxy:latest
-  DockerHAProxyImage: tripleoupstream/centos-binary-haproxy:latest
-  DockerHeatApiCfnConfigImage: tripleoupstream/centos-binary-heat-api-cfn:latest
-  DockerHeatApiCfnImage: tripleoupstream/centos-binary-heat-api-cfn:latest
-  DockerHeatApiConfigImage: tripleoupstream/centos-binary-heat-api:latest
-  DockerHeatApiImage: tripleoupstream/centos-binary-heat-api:latest
-  DockerHeatConfigImage: tripleoupstream/centos-binary-heat-api:latest
-  DockerHeatEngineImage: tripleoupstream/centos-binary-heat-engine:latest
-  DockerHorizonConfigImage: tripleoupstream/centos-binary-horizon:latest
-  DockerHorizonImage: tripleoupstream/centos-binary-horizon:latest
-  DockerIronicApiImage: tripleoupstream/centos-binary-ironic-api:latest
-  DockerIronicApiConfigImage: tripleoupstream/centos-binary-ironic-api:latest
-  DockerIronicConductorImage: tripleoupstream/centos-binary-ironic-conductor:latest
-  DockerIronicConfigImage: tripleoupstream/centos-binary-ironic-pxe:latest
-  DockerIronicInspectorConfigImage: tripleoupstream/centos-binary-ironic-inspector:latest
-  DockerIronicInspectorImage: tripleoupstream/centos-binary-ironic-inspector:latest
-  DockerIronicPxeImage: tripleoupstream/centos-binary-ironic-pxe:latest
-  DockerIscsidConfigImage: tripleoupstream/centos-binary-iscsid:latest
-  DockerIscsidImage: tripleoupstream/centos-binary-iscsid:latest
-  DockerKeystoneConfigImage: tripleoupstream/centos-binary-keystone:latest
-  DockerKeystoneImage: tripleoupstream/centos-binary-keystone:latest
-  DockerManilaApiImage: tripleoupstream/centos-binary-manila-api:latest
-  DockerManilaConfigImage: tripleoupstream/centos-binary-manila-api:latest
-  DockerManilaSchedulerImage: tripleoupstream/centos-binary-manila-scheduler:latest
-  DockerManilaShareImage: tripleoupstream/centos-binary-manila-share:latest
-  DockerMemcachedConfigImage: tripleoupstream/centos-binary-memcached:latest
-  DockerMemcachedImage: tripleoupstream/centos-binary-memcached:latest
-  DockerMistralApiImage: tripleoupstream/centos-binary-mistral-api:latest
-  DockerMistralConfigImage: tripleoupstream/centos-binary-mistral-api:latest
-  DockerMistralEngineImage: tripleoupstream/centos-binary-mistral-engine:latest
-  DockerMistralExecutorImage: tripleoupstream/centos-binary-mistral-executor:latest
-  DockerMongodbConfigImage: tripleoupstream/centos-binary-mongodb:latest
-  DockerMongodbImage: tripleoupstream/centos-binary-mongodb:latest
-  DockerMultipathdConfigImage: tripleoupstream/centos-binary-multipathd:latest
-  DockerMultipathdImage: tripleoupstream/centos-binary-multipathd:latest
-  DockerMysqlClientConfigImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerMysqlConfigImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerMysqlImage: tripleoupstream/centos-binary-mariadb:latest
-  DockerNeutronApiImage: tripleoupstream/centos-binary-neutron-server:latest
-  DockerNeutronConfigImage: tripleoupstream/centos-binary-neutron-server:latest
-  DockerNeutronDHCPImage: tripleoupstream/centos-binary-neutron-dhcp-agent:latest
-  DockerNeutronL3AgentImage: tripleoupstream/centos-binary-neutron-l3-agent:latest
-  DockerNeutronMetadataImage: tripleoupstream/centos-binary-neutron-metadata-agent:latest
-  DockerNovaApiImage: tripleoupstream/centos-binary-nova-api:latest
-  DockerNovaComputeImage: tripleoupstream/centos-binary-nova-compute:latest
-  DockerNovaComputeIronicImage: tripleoupstream/centos-binary-nova-compute-ironic:latest
-  DockerNovaConductorImage: tripleoupstream/centos-binary-nova-conductor:latest
-  DockerNovaConfigImage: tripleoupstream/centos-binary-nova-base:latest
-  DockerNovaConsoleauthImage: tripleoupstream/centos-binary-nova-consoleauth:latest
-  DockerNovaLibvirtConfigImage: tripleoupstream/centos-binary-nova-compute:latest
-  DockerNovaLibvirtImage: tripleoupstream/centos-binary-nova-libvirt:latest
-  DockerNovaPlacementConfigImage: tripleoupstream/centos-binary-nova-placement-api:latest
-  DockerNovaPlacementImage: tripleoupstream/centos-binary-nova-placement-api:latest
-  DockerNovaSchedulerImage: tripleoupstream/centos-binary-nova-scheduler:latest
-  DockerNovaVncProxyImage: tripleoupstream/centos-binary-nova-novncproxy:latest
-  DockerOVNControllerConfigImage: tripleoupstream/centos-binary-ovn-controller:latest
-  DockerOVNControllerImage: tripleoupstream/centos-binary-ovn-controller:latest
-  DockerOVNNbDbImage: tripleoupstream/centos-binary-ovn-nb-db-server:latest
-  DockerOVNNorthdImage: tripleoupstream/centos-binary-ovn-northd:latest
-  DockerOVNSbDbImage: tripleoupstream/centos-binary-ovn-sb-db-server:latest
-  DockerOctaviaApiImage: tripleoupstream/centos-binary-octavia-api:latest
-  DockerOctaviaConfigImage: tripleoupstream/centos-binary-octavia-api:latest
-  DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest
-  DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest
-  DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest
-  DockerOpendaylightApiImage: tripleoupstream/centos-binary-opendaylight:latest
-  DockerOpendaylightConfigImage: tripleoupstream/centos-binary-opendaylight:latest
-  DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
-  DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest
-  DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest
-  DockerRabbitmqConfigImage: tripleoupstream/centos-binary-rabbitmq:latest
-  DockerRabbitmqImage: tripleoupstream/centos-binary-rabbitmq:latest
-  DockerRedisConfigImage: tripleoupstream/centos-binary-redis:latest
-  DockerRedisImage: tripleoupstream/centos-binary-redis:latest
-  DockerSaharaApiImage: tripleoupstream/centos-binary-sahara-api:latest
-  DockerSaharaConfigImage: tripleoupstream/centos-binary-sahara-api:latest
-  DockerSaharaEngineImage: tripleoupstream/centos-binary-sahara-engine:latest
-  DockerSensuClientImage: tripleoupstream/centos-binary-sensu-client:latest
-  DockerSensuConfigImage: tripleoupstream/centos-binary-sensu-client:latest
-  DockerSwiftAccountImage: tripleoupstream/centos-binary-swift-account:latest
-  DockerSwiftConfigImage: tripleoupstream/centos-binary-swift-proxy-server:latest
-  DockerSwiftContainerImage: tripleoupstream/centos-binary-swift-container:latest
-  DockerSwiftObjectImage: tripleoupstream/centos-binary-swift-object:latest
-  DockerSwiftProxyImage: tripleoupstream/centos-binary-swift-proxy-server:latest
-  DockerTackerConfigImage: tripleoupstream/centos-binary-tacker:latest
-  DockerTackerImage: tripleoupstream/centos-binary-tacker:latest
-  DockerZaqarConfigImage: tripleoupstream/centos-binary-zaqar:latest
-  DockerZaqarImage: tripleoupstream/centos-binary-zaqar:latest
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml
index 49d02e6f..19a43623 100644
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@@ -1,11 +1,6 @@
 # This environment contains the services that can work with TLS-everywhere.
 resource_registry:
-  # This can be used when you don't want to run puppet on the host,
-  # e.g atomic, but it has been replaced with OS::TripleO::Services::Docker
-  # OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
   OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
-  # The compute node still needs extra initialization steps
-  OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
 
@@ -26,7 +21,7 @@ resource_registry:
   OS::TripleO::Services::HeatApi: ../docker/services/heat-api.yaml
   OS::TripleO::Services::HeatApiCfn: ../docker/services/heat-api-cfn.yaml
   OS::TripleO::Services::HeatEngine: ../docker/services/heat-engine.yaml
-  OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml
+  OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml
   OS::TripleO::Services::Keystone: ../docker/services/keystone.yaml
   OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
   OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml
@@ -36,8 +31,18 @@ resource_registry:
   OS::TripleO::Services::NeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
   OS::TripleO::Services::NeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml
   OS::TripleO::Services::NeutronServer: ../docker/services/neutron-api.yaml
+  OS::TripleO::Services::NovaApi: ../docker/services/nova-api.yaml
+  OS::TripleO::Services::NovaConductor: ../docker/services/nova-conductor.yaml
+  OS::TripleO::Services::NovaConsoleauth: ../docker/services/nova-consoleauth.yaml
+  OS::TripleO::Services::NovaMigrationTarget: ../docker/services/nova-migration-target.yaml
+  OS::TripleO::Services::NovaPlacement: ../docker/services/nova-placement.yaml
+  OS::TripleO::Services::NovaScheduler: ../docker/services/nova-scheduler.yaml
+  OS::TripleO::Services::NovaVncProxy: ../docker/services/nova-vnc-proxy.yaml
   OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
   OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
   OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
   OS::TripleO::Services::SwiftRingBuilder: ../docker/services/swift-ringbuilder.yaml
   OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml
+  OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
+  OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
+  OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 9b977f6e..dfa30b08 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -1,10 +1,4 @@
 resource_registry:
-  # This can be used when you don't want to run puppet on the host,
-  # e.g atomic, but it has been replaced with OS::TripleO::Services::Docker
-  # OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
-  # The compute node still needs extra initialization steps
-  OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
-
   OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
@@ -22,6 +16,7 @@ resource_registry:
   OS::TripleO::Services::NovaPlacement: ../docker/services/nova-placement.yaml
   OS::TripleO::Services::NovaConductor: ../docker/services/nova-conductor.yaml
   OS::TripleO::Services::NovaConsoleauth: ../docker/services/nova-consoleauth.yaml
+  OS::TripleO::Services::NovaMetadata: ../docker/services/nova-metadata.yaml
   OS::TripleO::Services::NovaMigrationTarget: ../docker/services/nova-migration-target.yaml
   OS::TripleO::Services::NovaScheduler: ../docker/services/nova-scheduler.yaml
   OS::TripleO::Services::NovaVncProxy: ../docker/services/nova-vnc-proxy.yaml
@@ -56,6 +51,7 @@ resource_registry:
   OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml
   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
diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml
index 834c4f10..81044170 100644
--- a/environments/hyperconverged-ceph.yaml
+++ b/environments/hyperconverged-ceph.yaml
@@ -11,6 +11,7 @@ parameter_defaults:
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Securetty
diff --git a/environments/major-upgrade-composable-steps.yaml b/environments/major-upgrade-composable-steps.yaml
index 5a695171..db83f906 100644
--- a/environments/major-upgrade-composable-steps.yaml
+++ b/environments/major-upgrade-composable-steps.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
+  OS::TripleO::PostDeploySteps: ../common/major_upgrade_steps.yaml
 parameter_defaults:
   EnableConfigPurge: true
   StackUpdateType: UPGRADE
diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml
new file mode 100644
index 00000000..bb27ee43
--- /dev/null
+++ b/environments/network-isolation-v6.j2.yaml
@@ -0,0 +1,58 @@
+{%- set primary_role = [roles[0]] -%}
+{%- for role in roles -%}
+  {%- if 'primary' in role.tags and 'controller' in role.tags -%}
+    {%- set _ = primary_role.pop() -%}
+    {%- set _ = primary_role.append(role) -%}
+  {%- endif -%}
+{%- endfor -%}
+{%- set primary_role_name = primary_role[0].name -%}
+# Enable the creation of Neutron networks for isolated Overcloud
+# traffic and configure each role to assign ports (related
+# to that role) on these networks.
+# primary role is: {{primary_role_name}}
+resource_registry:
+  # networks as defined in network_data.yaml
+  {%- for network in networks if network.enabled|default(true) %}
+    {%- if network.name != 'Tenant' %}
+  OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}_v6.yaml
+    {%- else %}
+    # IPv4 until OVS and Neutron support IPv6 tunnel endpoints
+  OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml
+    {%- endif %}
+  {%- endfor %}
+
+  # Port assignments for the VIPs
+  {%- for network in networks if network.vip and network.enabled|default(true) %}
+  OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
+  {%- endfor %}
+
+  OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml
+
+{%- for role in roles %}
+  # Port assignments for the {{role.name}}
+  {%- for network in networks %}
+    {%- if network.name in role.networks|default([]) and network.enabled|default(true) and network.name != 'Tenant' %}
+  OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
+    {%- elif network.name in role.networks|default([]) and network.enabled|default(true) and network.name == 'Tenant' %}
+    # IPv4 until OVS and Neutron support IPv6 tunnel endpoints
+  OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
+    {%- else %}
+  OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/noop.yaml
+    {%- endif %}
+  {%- endfor %}
+{%- endfor %}
+
+
+parameter_defaults:
+  # Enable IPv6 for Ceph.
+  CephIPv6: True
+  # Enable IPv6 for Corosync. This is required when Corosync is using an IPv6 IP in the cluster.
+  CorosyncIPv6: True
+  # Enable IPv6 for MongoDB. This is required when MongoDB is using an IPv6 IP.
+  MongoDbIPv6: True
+  # Enable various IPv6 features in Nova.
+  NovaIPv6: True
+  # Enable IPv6 environment for RabbitMQ.
+  RabbitIPv6: True
+  # Enable IPv6 environment for Memcached.
+  MemcachedIPv6: True
diff --git a/environments/network-isolation-v6.yaml b/environments/network-isolation-v6.yaml
deleted file mode 100644
index 11ca5b31..00000000
--- a/environments/network-isolation-v6.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# Enable the creation of IPv6 Neutron networks for isolated Overcloud
-# traffic and configure each role to assign ports (related
-# to that role) on these networks.
-resource_registry:
-  OS::TripleO::Network::External: ../network/external_v6.yaml
-  OS::TripleO::Network::InternalApi: ../network/internal_api_v6.yaml
-  OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt_v6.yaml
-  OS::TripleO::Network::Storage: ../network/storage_v6.yaml
-  # IPv4 until OVS and Neutron support IPv6 tunnel endpoints
-  OS::TripleO::Network::Tenant: ../network/tenant.yaml
-
-  # Port assignments for the VIPs
-  OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_v6.yaml
-  OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage_v6.yaml
-  OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt_v6.yaml
-  OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml
-
-  # Port assignments for the controller role
-  OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_v6.yaml
-  OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-  OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml
-
-  # Port assignments for the compute role
-  OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml
-
-  # Port assignments for the ceph storage role
-  OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-
-  # Port assignments for the swift storage role
-  OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-
-  # Port assignments for the block storage role
-  OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::BlockStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::BlockStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
-
-parameter_defaults:
-  # Enable IPv6 for Ceph.
-  CephIPv6: True
-  # Enable IPv6 for Corosync. This is required when Corosync is using an IPv6 IP in the cluster.
-  CorosyncIPv6: True
-  # Enable IPv6 for MongoDB. This is required when MongoDB is using an IPv6 IP.
-  MongoDbIPv6: True
-  # Enable various IPv6 features in Nova.
-  NovaIPv6: True
-  # Enable IPv6 environment for RabbitMQ.
-  RabbitIPv6: true
-  # Enable IPv6 environment for Memcached.
-  MemcachedIPv6: true
diff --git a/environments/network-management-v6.yaml b/environments/network-management-v6.yaml
index 812e84f3..59056217 100644
--- a/environments/network-management-v6.yaml
+++ b/environments/network-management-v6.yaml
@@ -1,3 +1,7 @@
+# ******************************************************************************
+# DEPRECATED: Use tripleo-heat-templates/environments/network-isolation-v6.yaml
+# and define the needed networks in your custom role file.
+# ******************************************************************************
 # Enable the creation of an IPv6 system management network. This
 # creates a Neutron network for isolated Overcloud
 # system management traffic and configures each role to
diff --git a/environments/network-management.yaml b/environments/network-management.yaml
index 041617be..5f50bb15 100644
--- a/environments/network-management.yaml
+++ b/environments/network-management.yaml
@@ -1,3 +1,7 @@
+# ***************************************************************************
+# DEPRECATED: Use tripleo-heat-templates/environments/network-isolation.yaml
+# and define the needed networks in your custom role file.
+# ***************************************************************************
 # Enable the creation of a system management network. This
 # creates a Neutron network for isolated Overcloud
 # system management traffic and configures each role to
diff --git a/environments/storage/external-ceph.yaml b/environments/storage/external-ceph.yaml
index f1c9d516..0f2d0396 100644
--- a/environments/storage/external-ceph.yaml
+++ b/environments/storage/external-ceph.yaml
@@ -13,7 +13,7 @@ parameter_defaults:
   # Type: string
   CephAdminKey: ''
 
-  # The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
+  # The Ceph client key. Can be created with ceph-authtool --gen-print-key.
   # Mandatory. This parameter must be set by the user.
   # Type: string
   CephClientKey: <None>