diff options
| author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 15:45:45 +0200 |
|---|---|---|
| committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 15:45:45 +0200 |
| commit | b8dcab08624bfdc4e89a144b82caa68883d1f861 (patch) | |
| tree | ef0056ba5d90c5a3b58cf2b285d4e84bd53d4b99 /playbooks/openstack | |
| parent | 9229927a98389f0dae2abb51e1df971f9457afb3 (diff) | |
| download | openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.gz openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.bz2 openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.xz openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.zip | |
Removed some application specific code like insecure registries, heat template
Diffstat (limited to 'playbooks/openstack')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml index cd2636c9c..40e4ab22c 100644 --- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml +++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml @@ -88,12 +88,6 @@ parameters: label: Infra flavor description: Flavor of the infra node servers - key_pair: - type: string - label: Key name - description: Name of the key - - outputs: master_names: @@ -297,7 +291,7 @@ resources: type: master image: { get_param: master_image } flavor: { get_param: master_flavor } - key_name: { get_param: key_pair } + key_name: { get_resource: keypair } net: { get_resource: net } subnet: { get_resource: subnet } secgrp: @@ -329,7 +323,7 @@ resources: subtype: compute image: { get_param: node_image } flavor: { get_param: node_flavor } - key_name: { get_param: key_pair } + key_name: { get_resource: keypair } net: { get_resource: net } subnet: { get_resource: subnet } secgrp: @@ -361,7 +355,7 @@ resources: subtype: infra image: { get_param: infra_image } flavor: { get_param: infra_flavor } - key_name: { get_param: key_pair } + key_name: { get_resource: keypair } net: { get_resource: net } subnet: { get_resource: subnet } secgrp: |