summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-14 22:48:51 +0000
committerGerrit Code Review <review@openstack.org>2015-12-14 22:48:51 +0000
commit55e0c425f565ea825421d2a4d062449d5347da8d (patch)
treeeb7f1efd9ab68473b5f83575dad7ea0fa8bfafb6 /puppet
parent8841ad7bbb49eac406fcde61bd23aa79ba210b24 (diff)
parent35477d36d372bbe257b2cff8a88ae28c17f5f379 (diff)
Merge "Fix wrong keypair parameter description"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/ceph-storage.yaml2
-rw-r--r--puppet/cinder-storage.yaml2
-rw-r--r--puppet/compute.yaml2
-rw-r--r--puppet/controller.yaml2
-rw-r--r--puppet/swift-storage.yaml2
5 files changed, 5 insertions, 5 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index adbf4bc5..b6a1007a 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -16,7 +16,7 @@ parameters:
description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
type: string
KeyName:
- description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ description: Name of an existing Nova key pair to enable SSH access to the instances
type: string
default: default
constraints:
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 1c05b387..fc197059 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -46,7 +46,7 @@ parameters:
- custom_constraint: nova.flavor
KeyName:
default: default
- description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ description: Name of an existing Nova key pair to enable SSH access to the instances
type: string
RabbitPassword:
default: 'guest'
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 5e38d1c1..247c0326 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -61,7 +61,7 @@ parameters:
description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
type: string
KeyName:
- description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ description: Name of an existing Nova key pair to enable SSH access to the instances
type: string
default: default
constraints:
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index fc257069..5d39462c 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -246,7 +246,7 @@ parameters:
type: string
KeyName:
default: default
- description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ description: Name of an existing Nova key pair to enable SSH access to the instances
type: string
constraints:
- custom_constraint: nova.keypair
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 840cf540..721dcba4 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -17,7 +17,7 @@ parameters:
type: string
KeyName:
default: default
- description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ description: Name of an existing Nova key pair to enable SSH access to the instances
type: string
MountCheck:
default: 'false'