From 3ba9cee1bdf19358aed2a5e0430b77e8c6a13f0a Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Thu, 28 Jun 2012 17:05:07 -0700 Subject: [PATCH 1/4] Change to reflect essex repos and keystone essex config name --- anvil/components/keystone.py | 2 +- conf/anvil.ini | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anvil/components/keystone.py b/anvil/components/keystone.py index a863fc38..a24440b3 100644 --- a/anvil/components/keystone.py +++ b/anvil/components/keystone.py @@ -48,7 +48,7 @@ INIT_WHAT_HAPPENED = "keystone.inited.yaml" # Simple confs ROOT_CONF = "keystone.conf" -ROOT_SOURCE_FN = "keystone.conf.sample" +ROOT_SOURCE_FN = "keystone.conf" LOGGING_CONF = "logging.conf" LOGGING_SOURCE_FN = 'logging.conf.sample' POLICY_JSON = 'policy.json' diff --git a/conf/anvil.ini b/conf/anvil.ini index 370ca08b..eeeec7d2 100644 --- a/conf/anvil.ini +++ b/conf/anvil.ini @@ -247,15 +247,15 @@ ec2_cert_fn = ~/cert.pm # Compute service git repo nova_repo = git://github.com/openstack/nova.git -nova_branch = master +nova_branch = stable/essex # Storage service git repo swift_repo = git://github.com/openstack/swift.git -swift_branch = master +swift_branch = stable/essex # Image catalog service git repo glance_repo = git://github.com/openstack/glance.git -glance_branch = master +glance_branch = stable/essex # Python glance client library glanceclient_repo = git://github.com/openstack/python-glanceclient.git @@ -263,7 +263,7 @@ glanceclient_branch = master # Unified auth system (manages accounts/tokens) git repo keystone_repo = git://github.com/openstack/keystone.git -keystone_branch = master +keystone_branch = stable/essex # A websockets/html5 or flash powered VNC console for vm instances novnc_repo = git://github.com/kanaka/noVNC.git @@ -271,7 +271,7 @@ novnc_branch = master # Django powered web control panel for openstack horizon_repo = git://github.com/openstack/horizon.git -horizon_branch = master +horizon_branch = stable/essex # Python keystone client library to nova that horizon uses keystoneclient_repo = git://github.com/openstack/python-keystoneclient.git @@ -283,7 +283,7 @@ novaclient_branch = master # Quantum service git repo quantum_repo = git://github.com/openstack/quantum.git -quantum_branch = master +quantum_branch = stable/essex # Quantum client git repo quantum_client_repo = git://github.com/openstack/python-quantumclient.git @@ -291,7 +291,7 @@ quantum_client_branch = master # Melange service melange_repo = git://github.com/openstack/melange.git -melange_branch = master +melange_branch = stable/essex # Python melange client library melangeclient_repo = git://github.com/openstack/python-melangeclient.git From 53bc14bb56d1ed0f1921d97801e71bdceae784ef Mon Sep 17 00:00:00 2001 From: Melanie Witt Date: Fri, 31 Aug 2012 22:56:33 +0000 Subject: [PATCH 2/4] fix typo, add regex, and make upload tool executable --- tools/upload-img-noanvil.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 tools/upload-img-noanvil.py diff --git a/tools/upload-img-noanvil.py b/tools/upload-img-noanvil.py old mode 100644 new mode 100755 index c5189572..10ba8ea8 --- a/tools/upload-img-noanvil.py +++ b/tools/upload-img-noanvil.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (C) 2012 Yahoo! Inc. All Rights Reserved. @@ -62,6 +64,7 @@ KERNEL_CHECKS = [ ROOT_CHECKS = [ re.compile(r"(.*)img$", re.I), re.compile(r'(.*?)aki-tty/image$', re.I), + re.compile(r'(.*?)qcow2$', re.I), ] # Used to match various file names with what could be a ram disk image @@ -91,7 +94,7 @@ def pipe_in_out(in_fh, out_fh, chunk_size=1024): if data == '': break else: - ofh.write(data) + out_fh.write(data) bytes_piped += len(data) return bytes_piped From 652bcc78097da1020428208d1e7dab4de8a3b698 Mon Sep 17 00:00:00 2001 From: Melanie Witt Date: Thu, 6 Sep 2012 21:10:34 +0000 Subject: [PATCH 3/4] exclude .md5 files in upload tool --- tools/upload-img-noanvil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/upload-img-noanvil.py b/tools/upload-img-noanvil.py index 10ba8ea8..0155d051 100755 --- a/tools/upload-img-noanvil.py +++ b/tools/upload-img-noanvil.py @@ -56,7 +56,7 @@ NAME_CLEANUPS.reverse() # Used to match various file names with what could be a kernel image KERNEL_CHECKS = [ - re.compile(r"(.*)vmlinuz(.*)$", re.I), + re.compile(r"(.*)vmlinuz(.*)(?!\.md5)....$", re.I), re.compile(r'(.*?)aki-tty/image$', re.I), ] @@ -70,7 +70,7 @@ ROOT_CHECKS = [ # Used to match various file names with what could be a ram disk image RAMDISK_CHECKS = [ re.compile(r"(.*)-initrd$", re.I), - re.compile(r"(.*)initramfs(.*)$", re.I), + re.compile(r"(.*)initramfs(.*)(?!\.md5)....$", re.I), re.compile(r'(.*?)ari-tty/image$', re.I), ] From bb6be0823823a09e0f661c8f8ec0bb855115093c Mon Sep 17 00:00:00 2001 From: melwitt Date: Wed, 10 Oct 2012 00:35:19 +0000 Subject: [PATCH 4/4] fix default value for instance_name_prefix --- anvil/components/nova.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anvil/components/nova.py b/anvil/components/nova.py index 464d5938..4f26458a 100644 --- a/anvil/components/nova.py +++ b/anvil/components/nova.py @@ -108,7 +108,7 @@ class NovaUninstaller(comp.PythonUninstallComponent): def _clear_libvirt_domains(self): virt_driver = nhelper.canon_virt_driver(self.get_option('virt_driver')) if virt_driver == 'libvirt': - inst_prefix = self.get_option('instance_name_prefix', 'instance-') + inst_prefix = self.get_option('instance_name_prefix', default_value='instance-') libvirt_type = lv.canon_libvirt_type(self.get_option('libvirt_type')) self.virsh.clear_domains(libvirt_type, inst_prefix)