diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-06-04 22:47:15 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-06-10 19:34:07 -0400 |
| commit | e437e100b43d624de3a524b7a51b0b4aac9d4460 (patch) | |
| tree | 73fab11d420607159f81bbb33b3b0e2697513d7e /overcloud-without-mergepy.yaml | |
| parent | 5033fd06894c3ac9ff99a82cb74020868da42306 (diff) | |
Add support for isolating swift storage nets
This patch updates the Puppet Swift storage role
so that it supports network isolation. By default
all traffic still flows on the ctlplane network
but if network isolation is enabled then network
traffic will flow over the configured storage_mgmt
network interface.
This patch also fixes a few critical issues with
the swift storage role that prevented it from
working:
- oac_data for the swift devices was overriding the
data provided in the swift_devices_and_proxy
hieradata file.
- the role was missing declarations to load hieradata
files for swift_devices_and_proxy and all_nodes
- The required snmpd settings were not getting set
correctly in the 'object' hiera data file.
With all of these changes the Swift storage role
works correctly with and without network isolation.
Change-Id: I541abb2604380f603bba91ad88e54783ee450a8f
Diffstat (limited to 'overcloud-without-mergepy.yaml')
| -rw-r--r-- | overcloud-without-mergepy.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 661497ce..224c4167 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -787,6 +787,7 @@ resources: Replicas: { get_param: SwiftReplicas} NtpServer: {get_param: NtpServer} UpdateIdentifier: {get_param: UpdateIdentifier} + ServiceNetMap: {get_param: ServiceNetMap} CephStorage: type: OS::Heat::ResourceGroup |