diff options
| author | Martin André <martin.andre@kvhasia.com> | 2015-04-28 12:12:14 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-04-28 12:15:42 +0900 |
| commit | 90ad52c4c1f2fd18749697064e069a4483b0e2c5 (patch) | |
| tree | e5b311027be2d803212cf98cd4e77558b669c0e6 /compose | |
| parent | 5f1cfa824ff79853ebe39244fc29a6f8add0e6ca (diff) | |
| download | kolla-90ad52c4c1f2fd18749697064e069a4483b0e2c5.tar.gz kolla-90ad52c4c1f2fd18749697064e069a4483b0e2c5.zip | |
Consolidate tools/conf-* scripts in tools/init-runonce
Fix issues reported in https://review.openstack.org/#/c/177681/3, and
simplify detection of cirros images in glance.
Only add developer's SSH key to nova if ~/.ssh/id_rsa.pub exists and is
readable.
Change-Id: I5936c6db399d63902d460b0d3c959619073cc3cc
Diffstat (limited to 'compose')
| -rw-r--r-- | compose/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compose/README.md b/compose/README.md index 926f86824..4cd0cf63c 100644 --- a/compose/README.md +++ b/compose/README.md @@ -14,7 +14,7 @@ to use the installation. If using nova networking use: ``` # source openrc -# tools/conf-novanet +# tools/init-runonce # nova boot --flavor m1.medium --key_name mykey --image puffy_clouds instance_name # ssh cirros@<ip> ``` @@ -23,7 +23,7 @@ Else if using neutron networking use: ``` # source openrc -# tools/conf-neutronnet +# tools/init-runonce # nova boot --flavor m1.medium --key_name mykey --image puffy_clouds instance_name --nic net-id:<net id> # ssh cirros@<ip> ``` |