16 files changed, 107 insertions, 209 deletions
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-ha.yaml b/environments/docker-ha.yaml
index 474e9966..1e25a357 100644
--- a/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@ -5,6 +5,8 @@ resource_registry:
   # Pacemaker runs on the host
   OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
+  OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
 
   # Services that are disabled for HA deployments with pacemaker
   OS::TripleO::Services::Keepalived: OS::Heat::None
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml
index 57cf2c5e..0b01da4d 100644
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@@ -14,6 +14,10 @@ resource_registry:
   OS::TripleO::Services::AodhEvaluator: ../docker/services/aodh-evaluator.yaml
   OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml
   OS::TripleO::Services::AodhNotifier: ../docker/services/aodh-notifier.yaml
+  OS::TripleO::Services::CeilometerAgentCentral: ../docker/services/ceilometer-agent-central.yaml
+  OS::TripleO::Services::CeilometerAgentIpmi: ../docker/services/ceilometer-agent-ipmi.yaml
+  OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
+  OS::TripleO::Services::ComputeCeilometerAgent: ../docker/services/ceilometer-agent-compute.yaml
   OS::TripleO::Services::ComputeNeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml
   OS::TripleO::Services::GlanceApi: ../docker/services/glance-api.yaml
   OS::TripleO::Services::GnocchiApi: ../docker/services/gnocchi-api.yaml
@@ -22,20 +26,19 @@ 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::Keystone: ../docker/services/keystone.yaml
-  OS::TripleO::Services::NovaMigrationTarget: ../docker/services/nova-migration-target.yaml
-  OS::TripleO::Services::NeutronServer: ../docker/services/neutron-api.yaml
+  OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
   OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
-  OS::TripleO::Services::NeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
-  OS::TripleO::Services::NeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml
   OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml
+  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::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::PostDeploySteps: ../docker/post.yaml
-  OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
+  OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
+  OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 336a0b3c..9b977f6e 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -61,6 +61,3 @@ resource_registry:
   # 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::PostDeploySteps: ../docker/post.yaml
-  OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
diff --git a/environments/ips-from-pool-all.yaml b/environments/ips-from-pool-all.yaml
index 87563753..d4eccbcf 100644
--- a/environments/ips-from-pool-all.yaml
+++ b/environments/ips-from-pool-all.yaml
@@ -51,7 +51,7 @@ parameter_defaults:
     - 172.16.0.251
     #management:
     #- 172.16.4.251
-  NovaComputeIPs:
+  ComputeIPs:
     # Each compute will get an IP from the lists below, first compute, first IP
     internal_api:
     - 172.16.2.252
diff --git a/environments/major-upgrade-composable-steps-docker.yaml b/environments/major-upgrade-composable-steps-docker.yaml
index 20340c78..888e2705 100644
--- a/environments/major-upgrade-composable-steps-docker.yaml
+++ b/environments/major-upgrade-composable-steps-docker.yaml
@@ -1,8 +1,5 @@
 resource_registry:
-  # FIXME(shardy) do we need to break major_upgrade_steps.yaml apart to
-  # enable docker specific logic, or is just overridding PostUpgradeSteps
-  # enough (as we want to share the ansible tasks steps etc)
-  OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
+  OS::TripleO::PostDeploySteps: ../common/major_upgrade_steps.yaml
 parameter_defaults:
   EnableConfigPurge: false
   StackUpdateType: UPGRADE
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/major-upgrade-converge-docker.yaml b/environments/major-upgrade-converge-docker.yaml
index 163d1de4..668f8a94 100644
--- a/environments/major-upgrade-converge-docker.yaml
+++ b/environments/major-upgrade-converge-docker.yaml
@@ -1,7 +1,7 @@
 # Use this to reset any mappings only used for upgrades after the
 # update of all nodes is completed
 resource_registry:
-  OS::TripleO::PostDeploySteps: ../docker/post.yaml
+  OS::TripleO::PostDeploySteps: ../common/post.yaml
 parameter_defaults:
   EnableConfigPurge: false
   StackUpdateType: ''
diff --git a/environments/major-upgrade-converge.yaml b/environments/major-upgrade-converge.yaml
index d222fb86..668f8a94 100644
--- a/environments/major-upgrade-converge.yaml
+++ b/environments/major-upgrade-converge.yaml
@@ -1,7 +1,7 @@
 # Use this to reset any mappings only used for upgrades after the
 # update of all nodes is completed
 resource_registry:
-  OS::TripleO::PostDeploySteps: ../puppet/post.yaml
+  OS::TripleO::PostDeploySteps: ../common/post.yaml
 parameter_defaults:
   EnableConfigPurge: false
   StackUpdateType: ''
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/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 601554a1..ce64311b 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -1,13 +1,13 @@
 # A Heat environment file which can be used to enable a
 # a Neutron Nuage backend on the controller, configured via puppet
 resource_registry:
+  OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   # Override the NeutronCorePlugin to use Nuage
-  OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginNuage
-  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-nuage.yaml
+  OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Nuage
 
 parameter_defaults:
   NeutronNuageNetPartitionName: 'default_name'
@@ -18,9 +18,18 @@ parameter_defaults:
   NeutronNuageBaseURIVersion: 'default_uri_version'
   NeutronNuageCMSId: ''
   UseForwardedFor: true
-  NeutronCorePlugin: 'nuage_neutron.plugins.nuage.plugin.NuagePlugin'
-  NeutronEnableDHCPAgent: false
-  NeutronServicePlugins: []
-  NovaOVSBridge: 'alubr0'
-  controllerExtraConfig:
+  NeutronServicePlugins: ''
+  NeutronDBSyncExtraParams: '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini'
+  NeutronTypeDrivers: ''
+  NeutronNetworkType: ''
+  NeutronMechanismDrivers: ''
+  NeutronPluginExtensions: ''
+  NeutronFlatNetworks: ''
+  NeutronTunnelIdRanges: ''
+  NeutronNetworkVLANRanges: ''
+  NeutronVniRanges: ''
+  NovaOVSBridge: 'default_bridge'
+  NeutronMetadataProxySharedSecret: 'default'
+  InstanceNameTemplate: 'inst-%08x'
+  ControllerExtraConfig:
     neutron::api_extensions_path: '/usr/lib/python2.7/site-packages/neutron/plugins/nuage/'
diff --git a/environments/nova-nuage-config.yaml b/environments/nova-nuage-config.yaml
index 56c64d15..5e75ed9e 100644
--- a/environments/nova-nuage-config.yaml
+++ b/environments/nova-nuage-config.yaml
@@ -2,7 +2,13 @@
 # Nuage backend on the compute, configured via puppet
 resource_registry:
   OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-nuage.yaml
 
 parameter_defaults:
   NuageActiveController: '0.0.0.0'
   NuageStandbyController: '0.0.0.0'
+  NovaOVSBridge: 'default_bridge'
+  NovaComputeLibvirtType: 'default_type'
+  NovaIPv6: False
+  NuageMetadataProxySharedSecret: 'default'
+  NuageNovaApiEndpoint: 'default_endpoint'
diff --git a/environments/puppet-ceph-external.yaml b/environments/puppet-ceph-external.yaml
index 2f577c26..7718b821 100644
--- a/environments/puppet-ceph-external.yaml
+++ b/environments/puppet-ceph-external.yaml
@@ -1,5 +1,5 @@
 # ******************************************************************************
-# DEPRECATED: Use tripleo-heat-templates/environments/storage/ceph-external.yaml
+# DEPRECATED: Use tripleo-heat-templates/environments/storage/external-ceph.yaml
 # instead.
 # ******************************************************************************
 # A Heat environment file which can be used to enable the