diff options
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/all-nodes-config.yaml | 6 | ||||
-rw-r--r-- | puppet/ceph-storage.yaml | 2 | ||||
-rw-r--r-- | puppet/cinder-storage.yaml | 2 | ||||
-rw-r--r-- | puppet/compute.yaml | 2 | ||||
-rw-r--r-- | puppet/controller.yaml | 2 | ||||
-rw-r--r-- | puppet/swift-storage.yaml | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 2bc519bb..3908afee 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -245,3 +245,9 @@ outputs: description: The ID of the allNodesConfigImpl resource. value: {get_resource: allNodesConfigImpl} + hosts_entries: + description: | + The content that should be appended to your /etc/hosts if you want do get + hostname-based access to the deployed nodes (useful for testing without + setting up a DNS). + value: {get_attr: [allNodesConfigImpl, config, hosts]} 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' |