openstack/openstacksdk
Code Issues Proposed changes

Merge "Fix failing compute example"

Browse Source
This commit is contained in:
Jenkins 2015-12-08 19:09:08 +00:00 committed by Gerrit Code Review
commit 5eca21ecdb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/compute/create.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import errno
import os import os
from examples.connect import FLAVOR_NAME from examples.connect import FLAVOR_NAME
@ -17,6 +18,7 @@ from examples.connect import IMAGE_NAME
from examples.connect import KEYPAIR_NAME from examples.connect import KEYPAIR_NAME
from examples.connect import NETWORK_NAME from examples.connect import NETWORK_NAME
from examples.connect import PRIVATE_KEYPAIR_FILE from examples.connect import PRIVATE_KEYPAIR_FILE
from examples.connect import SSH_DIR
""" """
Create resources with the Compute service. Create resources with the Compute service.
@ -35,6 +37,12 @@ def create_keypair(conn):
print(keypair) print(keypair)
try:
os.mkdir(SSH_DIR)
except OSError as e:
if e.errno != errno.EEXIST:
raise e
with open(PRIVATE_KEYPAIR_FILE, 'w') as f: with open(PRIVATE_KEYPAIR_FILE, 'w') as f:
f.write("%s" % keypair.private_key) f.write("%s" % keypair.private_key)

10
examples/connect.py
View File

@ -56,11 +56,11 @@ IMAGE_NAME = _get_resource_value('image_name', 'fedora-20.x86_64')
FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small') FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small')
NETWORK_NAME = _get_resource_value('network_name', 'private') NETWORK_NAME = _get_resource_value('network_name', 'private')
KEYPAIR_NAME = _get_resource_value('keypair_name', 'openstacksdk-example') KEYPAIR_NAME = _get_resource_value('keypair_name', 'openstacksdk-example')
PRIVATE_KEYPAIR_FILE = _get_resource_value('private_keypair_file', SSH_DIR = _get_resource_value(
"{home}/{ssh}/id_rsa.{key}".format( 'ssh_dir', '{home}/.ssh'.format(home=os.path.expanduser("~")))
home=os.getenv("HOME"), PRIVATE_KEYPAIR_FILE = _get_resource_value(
ssh='.ssh', 'private_keypair_file', '{ssh_dir}/id_rsa.{key}'.format(
key=KEYPAIR_NAME)) ssh_dir=SSH_DIR, key=KEYPAIR_NAME))
def create_connection_from_config(): def create_connection_from_config():