x/packstack
Code Issues Proposed changes

Update to more recent nova/quantum puppet modules for Puppet 2.6

Browse Source 
Several fixes upstream for Puppet 2.6 compatibility. There was also
a change that required the metadata agent stuff to be shuffled
around a bit.

Change-Id: Ic054839ebe2931b82a83e49ed967537a3597cec5
This commit is contained in:
Terry Wilson
2013-05-22 19:33:27 -05:00
parent 7a3055de02
commit 77b481a44c
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/plugins/nova_300.py
View File

@@ -269,7 +269,7 @@ def initSequences(controller):
{'title': 'Adding Nova Common manifest entries', 'functions':[createcommonmanifest]}, {'title': 'Adding Nova Common manifest entries', 'functions':[createcommonmanifest]},
] ]
if controller.CONF['CONFIG_QUANTUM_INSTALL']: if controller.CONF['CONFIG_QUANTUM_INSTALL'] == 'y':
novaapisteps.append({'title': 'Adding Openstack Network-related Nova manifest entries', 'functions':[createquantummanifest]}) novaapisteps.append({'title': 'Adding Openstack Network-related Nova manifest entries', 'functions':[createquantummanifest]})
else: else:
novaapisteps.append({'title': 'Adding Nova Network manifest entries', 'functions':[createnetworkmanifest]}) novaapisteps.append({'title': 'Adding Nova Network manifest entries', 'functions':[createnetworkmanifest]})
@@ -278,6 +278,16 @@ def initSequences(controller):
def createapimanifest(config): def createapimanifest(config):
# This is a hack around us needing to generate the quantum metadata
# password, but the nova puppet plugin uses the existence of that
# password to determine whether or not to configure quantum metadata
# proxy support. So the nova_api.pp template needs unquoted 'undef'
# to disable metadata support if quantum is not being installed.
if controller.CONF['CONFIG_QUANTUM_INSTALL'] != 'y':
controller.CONF['CONFIG_QUANTUM_METADATA_PW_UNQUOTED'] = 'undef'
else:
controller.CONF['CONFIG_QUANTUM_METADATA_PW_UNQUOTED'] = \
"'%s'" % controller.CONF['CONFIG_QUANTUM_METADATA_PW']
manifestfile = "%s_api_nova.pp"%controller.CONF['CONFIG_NOVA_API_HOST'] manifestfile = "%s_api_nova.pp"%controller.CONF['CONFIG_NOVA_API_HOST']
manifestdata = getManifestTemplate("nova_api.pp") manifestdata = getManifestTemplate("nova_api.pp")
appendManifestFile(manifestfile, manifestdata, 'novaapi') appendManifestFile(manifestfile, manifestdata, 'novaapi')

2
packstack/puppet/modules/nova

Submodule packstack/puppet/modules/nova updated: 3eac0fd0cc...f1e12e1564

2
packstack/puppet/modules/quantum

Submodule packstack/puppet/modules/quantum updated: f45be92f34...9bda3b4726

1
packstack/puppet/templates/nova_api.pp
View File

@@ -4,6 +4,7 @@ class {"nova::api":
enabled => true, enabled => true,
auth_host => "%(CONFIG_KEYSTONE_HOST)s", auth_host => "%(CONFIG_KEYSTONE_HOST)s",
admin_password => "%(CONFIG_NOVA_KS_PW)s", admin_password => "%(CONFIG_NOVA_KS_PW)s",
quantum_metadata_proxy_shared_secret => %(CONFIG_QUANTUM_METADATA_PW_UNQUOTED)s
} }
Package<| title == 'nova-common' |> -> Class['nova::api'] Package<| title == 'nova-common' |> -> Class['nova::api']

7
packstack/puppet/templates/nova_quantum.pp
View File

@@ -8,10 +8,5 @@ class {"nova::network::quantum":
} }
class {"nova::compute::quantum": class {"nova::compute::quantum":
libvirt_vif_driver => "nova.virt.libvirt.vif.LibvirtGenericVifDriver", libvirt_vif_driver => "nova.virt.libvirt.vif.LibvirtGenericVIFDriver",
}
nova_config {
'DEFAULT/service_quantum_metadata_proxy': value => 'True';
'DEFAULT/quantum_metadata_proxy_shared_secret': value => '%(CONFIG_QUANTUM_METADATA_PW)s';
} }