summaryrefslogtreecommitdiffstats
path: root/examples/simple
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-07-06 11:58:52 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-07-06 11:58:52 -0600
commit5616cafabcc5f8ab75ee6fcaefa87e3fbd126ce9 (patch)
treefeeb024010654ca1889ae8231176fce083e4a41b /examples/simple
parent815a21216c6df1a33eff7a5521ee0b08f4696822 (diff)
Added support for using '~' for SSH key location.
While testing changes, fixed problems found with querying for floating IPs which also required adding network data to the VMInst domain object. JIRA: SNAPS-85 Change-Id: I0ecf3a6885ce84fe14c4a6db09269c56dc0ad9fc Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'examples/simple')
-rw-r--r--examples/simple/deploy-simple.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/simple/deploy-simple.yaml b/examples/simple/deploy-simple.yaml
index c58f135..3124210 100644
--- a/examples/simple/deploy-simple.yaml
+++ b/examples/simple/deploy-simple.yaml
@@ -44,15 +44,15 @@ openstack:
- simple-subnet
keypairs:
- keypair:
- name: simple
- public_filepath: /tmp/simple.pub
- private_filepath: /tmp/simple
+ name: simple-kp
+ public_filepath: /tmp/simple-kp.pub
+ private_filepath: /tmp/simple-kp
instances:
- instance:
name: simple-1
flavor: m1.small
imageName: Ubuntu14
- keypair_name: simple
+ keypair_name: simple-kp
userdata: "#cloud-config\npassword: cable123\nchpasswd: { expire: False }\nsshr_pwauth: True"
ports:
- port: