aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--environments/docker.yaml2
-rw-r--r--environments/manage-firewall.yaml2
-rw-r--r--environments/mongodb-nojournal.yaml2
-rw-r--r--environments/puppet-ceph-devel.yaml2
-rw-r--r--environments/puppet-tenant-vlan.yaml4
-rw-r--r--environments/updates/update-from-keystone-admin-internal-api.yaml2
6 files changed, 7 insertions, 7 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index be21d84..a7e2504 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -3,7 +3,7 @@ resource_registry:
OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml
OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
-parameters:
+parameter_defaults:
NovaImage: atomic-image
parameter_defaults:
diff --git a/environments/manage-firewall.yaml b/environments/manage-firewall.yaml
index 071f410..5d48698 100644
--- a/environments/manage-firewall.yaml
+++ b/environments/manage-firewall.yaml
@@ -1,2 +1,2 @@
-parameters:
+parameter_defaults:
ManageFirewall: true
diff --git a/environments/mongodb-nojournal.yaml b/environments/mongodb-nojournal.yaml
index 1e13e45..92cef53 100644
--- a/environments/mongodb-nojournal.yaml
+++ b/environments/mongodb-nojournal.yaml
@@ -1,5 +1,5 @@
# A Heat environment file which can be used to disable journal in MongoDb.
# Since, when journaling is enabled, MongoDb will create big journal file
# it can take time. In a CI environment for example journaling is not necessary.
-parameters:
+parameter_defaults:
MongoDbNoJournal: true
diff --git a/environments/puppet-ceph-devel.yaml b/environments/puppet-ceph-devel.yaml
index fb63af6..a2d1100 100644
--- a/environments/puppet-ceph-devel.yaml
+++ b/environments/puppet-ceph-devel.yaml
@@ -1,7 +1,7 @@
# A Heat environment file which can be used to enable a Ceph
# storage cluster using the controller and ceph nodes.
# Rbd backends are enabled for Cinder, Glance, Gnocchi and Nova.
-parameters:
+parameter_defaults:
#NOTE: These ID's and keys should be regenerated for
# a production deployment. What is here is suitable for
# developer and CI testing only.
diff --git a/environments/puppet-tenant-vlan.yaml b/environments/puppet-tenant-vlan.yaml
index 0df63ca..ed948bc 100644
--- a/environments/puppet-tenant-vlan.yaml
+++ b/environments/puppet-tenant-vlan.yaml
@@ -1,4 +1,4 @@
-parameters:
+parameter_defaults:
NeutronNetworkType: vlan
NeutronEnableTunnelling: false
- NeutronNetworkVLANRanges: datacentre:1:1000 \ No newline at end of file
+ NeutronNetworkVLANRanges: datacentre:1:1000
diff --git a/environments/updates/update-from-keystone-admin-internal-api.yaml b/environments/updates/update-from-keystone-admin-internal-api.yaml
index 3c71ef1..a9fa2be 100644
--- a/environments/updates/update-from-keystone-admin-internal-api.yaml
+++ b/environments/updates/update-from-keystone-admin-internal-api.yaml
@@ -1,7 +1,7 @@
# This environment file provides a default value for ServiceNetMap where
# Keystone Admin API service is running on the Internal API network
-parameters:
+parameter_defaults:
ServiceNetMap:
NeutronTenantNetwork: tenant
CeilometerApiNetwork: internal_api