diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/objectstorage-role.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/neutron-l3.yaml | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml index 40cd7578..2c76492a 100644 --- a/puppet/objectstorage-role.yaml +++ b/puppet/objectstorage-role.yaml @@ -226,13 +226,13 @@ resources: fqdn: list_join: - '.' - - - {get_attr: [Swiftexternal, name]} + - - {get_attr: [SwiftStorage, name]} - external - {get_param: CloudDomain} short: list_join: - '.' - - - {get_attr: [Swiftexternal, name]} + - - {get_attr: [SwiftStorage, name]} - external internal_api: fqdn: diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml index a2157555..dfa8c062 100644 --- a/puppet/services/neutron-l3.yaml +++ b/puppet/services/neutron-l3.yaml @@ -68,8 +68,7 @@ outputs: config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] - - neutron::agents::l3::router_delete_namespaces: True - neutron::agents::l3::agent_mode: {get_param: NeutronL3AgentMode} + - neutron::agents::l3::agent_mode: {get_param: NeutronL3AgentMode} tripleo.neutron_l3.firewall_rules: '106 neutron_l3 vrrp': proto: vrrp |