diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-30 21:48:12 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-30 21:48:12 +0000 |
commit | c5dbe7437fcdd7f41ec5b04c347c5c849e6ad3cf (patch) | |
tree | 458b7fab835e14b3a01b3287f382234177dcee7f | |
parent | 5e551764f13c012aa8aeeabcbff1bda3885fcf87 (diff) | |
parent | c834dce5f2f21115b11ffbc647b30c7c381ffaa0 (diff) |
Merge "Re-enable default for RoleParameters"
-rw-r--r-- | puppet/blockstorage-role.yaml | 1 | ||||
-rw-r--r-- | puppet/cephstorage-role.yaml | 1 | ||||
-rw-r--r-- | puppet/compute-role.yaml | 1 | ||||
-rw-r--r-- | puppet/controller-role.yaml | 1 | ||||
-rw-r--r-- | puppet/role.role.j2.yaml | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml index 612a4a01..f28f606f 100644 --- a/puppet/blockstorage-role.yaml +++ b/puppet/blockstorage-role.yaml @@ -142,6 +142,7 @@ parameters: RoleParameters: type: json description: Role Specific Parameters + default: {} DeploymentSwiftDataMap: type: json description: | diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml index e7afcb40..85b276d6 100644 --- a/puppet/cephstorage-role.yaml +++ b/puppet/cephstorage-role.yaml @@ -148,6 +148,7 @@ parameters: RoleParameters: type: json description: Role Specific Parameters + default: {} DeploymentSwiftDataMap: type: json description: | diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml index 5a662e86..10d082cb 100644 --- a/puppet/compute-role.yaml +++ b/puppet/compute-role.yaml @@ -160,6 +160,7 @@ parameters: RoleParameters: type: json description: Role Specific Parameters + default: {} DeploymentSwiftDataMap: type: json description: | diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 09e5b2b9..ca08c65d 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -178,6 +178,7 @@ parameters: RoleParameters: type: json description: Role Specific Parameters + default: {} DeploymentSwiftDataMap: type: json description: | diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index b45736c1..5aac0892 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -168,6 +168,7 @@ parameters: RoleParameters: type: json description: Role Specific Parameters + default: {} DeploymentSwiftDataMap: type: json description: | |