diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-08-03 01:40:17 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-08-03 01:40:17 +0000 |
commit | 8ef458559e9b847c2a732ee8e398c95e4c3b0beb (patch) | |
tree | c92a0f5a48ae6b2d7d58f91542e25a1cf6bbfd9f /puppet | |
parent | fd002f479a05840bd3acb15aa76bff2c666cc94c (diff) | |
parent | 4502b7cba6b86cfb041459dbcebe77219236ecaf (diff) |
Merge "Make RoleParameters and key_name descriptions consistent"
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/blockstorage-role.yaml | 2 | ||||
-rw-r--r-- | puppet/cephstorage-role.yaml | 2 | ||||
-rw-r--r-- | puppet/compute-role.yaml | 2 | ||||
-rw-r--r-- | puppet/controller-role.yaml | 2 | ||||
-rw-r--r-- | puppet/objectstorage-role.yaml | 2 | ||||
-rw-r--r-- | puppet/role.role.j2.yaml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml index 7d58d1da..de7b6b49 100644 --- a/puppet/blockstorage-role.yaml +++ b/puppet/blockstorage-role.yaml @@ -141,7 +141,7 @@ parameters: parameter is generated from the parent template. RoleParameters: type: json - description: Role Specific Parameters + description: Parameters specific to the role default: {} DeploymentSwiftDataMap: type: json diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml index 48e5b97a..ce44fd68 100644 --- a/puppet/cephstorage-role.yaml +++ b/puppet/cephstorage-role.yaml @@ -147,7 +147,7 @@ parameters: parameter is generated from the parent template. RoleParameters: type: json - description: Role Specific Parameters + description: Parameters specific to the role default: {} DeploymentSwiftDataMap: type: json diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml index 3ad6f745..af45793e 100644 --- a/puppet/compute-role.yaml +++ b/puppet/compute-role.yaml @@ -159,7 +159,7 @@ parameters: parameter is generated from the parent template. RoleParameters: type: json - description: Role Specific Parameters + description: Parameters specific to the role default: {} DeploymentSwiftDataMap: type: json diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 933b5e60..38589a4e 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -173,7 +173,7 @@ parameters: parameter is generated from the parent template. RoleParameters: type: json - description: Role Specific Parameters + description: Parameters specific to the role default: {} DeploymentSwiftDataMap: type: json diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml index a03a9da5..10e56450 100644 --- a/puppet/objectstorage-role.yaml +++ b/puppet/objectstorage-role.yaml @@ -141,7 +141,7 @@ parameters: parameter is generated from the parent template. RoleParameters: type: json - description: Role Specific Parameters + description: Parameters specific to the role default: {} DeploymentSwiftDataMap: type: json diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 18707b9a..23d8896e 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -180,7 +180,7 @@ parameters: parameter is generated from the parent template. RoleParameters: type: json - description: Role Specific Parameters + description: Parameters specific to the role default: {} DeploymentSwiftDataMap: type: json |