Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
As a side effect this fixes invalid keystone host generation
when multiple controller nodes are used.
Change-Id: I081976f0da94fc0232dfa2c34de03bbb4abf1a85
|
|
These config options are supposed to be under neutron.ovs (see template
for neutron openvswitch agent). They were mistakenly moved to be just
under neutron when the migration to SoftwareConfig was done.
Change-Id: I5769dc1dc501d48c965f8e4e36238cfcaac64a17
|
|
Overcloud bootstrap_nodeid is now specified by parameter
BootStrapNodeResource with default value controller0.
This avoids the need to use Fn::Select on the mergy.py
built list of controllers to specify the first controller.
Change-Id: Id9cfeab50b90ceeeae51ea0e35997b7495b28cc4
Partial-Blueprint: tripleo-juno-remove-mergepy
|
|
This change was generated and validated by running the following:
make hot clean all validate-all
This converts all templates to be valid HOT.
Fn::Select is not converted in this change but this will actually
work with heat_template_version 2013-05-23. Fn::Select is converted
manually in the next change in this series.
This change also sets the heat_template_version to 2014-10-16 which
includes the list_join intrinsic functions used throughout these
templates.
Partial-Blueprint: tripleo-juno-remove-mergepy
Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
|
|
All controller nodes are added into the list of swift devices and into
the list of memcache servers. This patch also removes swift storage nodes
from the list of memcache servers - I don't think that each storage node
should run proxy server (also swift-storage element doesn't depend on
swift-proxy).
Change-Id: Idb2ce2e2050fb84d8f8b564626b20e7b059fd685
|
|
We've found a couple of bugs in swift-storage-source.yaml which
were exposed when we tried to use the template to build a second
Swift storage node. These errors are:
a. Error in swift-devices metadata description - indentation
wasn't correct and a "-" was missing
b. Keystone config data required by the swift-proxy element
weren't defined
c. The signal_transport property wasn't defined and set to
NO_SIGNAL for SwiftStorage0Deploy (this meant that the
completion condition for the resource was never satisfied)
d. The user_data_format property for the SwiftStorage0
resource was not defined and set to SOFTWARE_CONFIG, which
meant that the SwiftStorage servers never got their config data
We've fixed the above errors. We've added an
OS::Heat::StructuredConfig and corresponding
OS::Heat::StructuredDeployment for the Keystone config data.
Change-Id: I858ebf9eea4ed33987143277f4c986b4934555d1
|
|
Swift proxy-servers use memcache to store and share metadata. This
change adds swift.proxy-memcache metadata to the swift-source and
swift-storage-source yaml templates modelled on the existing
swift.devices metadata. This metadata will be consumed by the
swift-proxy/os-config-applier/etc/swift/proxy-server.conf element
if the metadata exists.
Change-Id: If0b5724f69e7ec1c98e4dbdbeb9f08c4a18151b6
|
|
This migrates the overcloud to using OS::Heat::StructuredConfig and
OS::Heat::StructuredDeployment. With those tools, we can decouple
servers from software configuration and begin to deprecate features in
tripleo_heat_merge.
Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508
|
|
Updates all references for notCompute and notcompute
to use 'controller' instead.
Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010
Partial-bug: #1300324
|
|
Add the enable_tunneling option to the neutron-openvswitch-agent
metadata for the swift storage template. If not preset, this option is
left blank in the openvswitch plugin configuration plugin. This causes
the service to fail to start because a blank value is not permissible
for a boolean option.
Change-Id: Ieadcdab295913121bd00dbd25e4245024bc2240f
|
|
Updated the existing swift-source template to properly list all
swift devices.
Created a new swift-storage-source template to add additional
swift-storage only nodes.
The default SWIFTSTORAGESCALE is 0. Change this number to add
additional swift storage nodes.
Change-Id: Ia05f4ad44593316430d60541106d23b032c3e760
|