diff options
| -rw-r--r-- | environments/hyperconverged-ceph.yaml | 26 | ||||
| -rw-r--r-- | net-config-bond.yaml | 9 | ||||
| -rw-r--r-- | net-config-bridge.yaml | 8 | ||||
| -rw-r--r-- | net-config-static-bridge-with-external-dhcp.yaml | 9 | ||||
| -rw-r--r-- | network/config/bond-with-vlans/controller-v6.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/compute.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/controller-v6.yaml | 4 | ||||
| -rw-r--r-- | network/config/multiple-nics/controller.yaml | 3 | ||||
| -rw-r--r-- | network/config/single-nic-linux-bridge-vlans/controller-v6.yaml | 3 | ||||
| -rw-r--r-- | network/config/single-nic-linux-bridge-vlans/controller.yaml | 3 | ||||
| -rw-r--r-- | network/config/single-nic-vlans/controller-v6.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/swift-proxy.yaml | 5 |
12 files changed, 27 insertions, 50 deletions
diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index cee4ae4a..8258ae91 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -5,7 +5,25 @@ resource_registry: parameter_defaults: ComputeServices: - - OS::TripleO::Services::CephOSD - -parameter_merge_strategies: - ComputeServices: merge
\ No newline at end of file + - OS::TripleO::Services::CACerts + - OS::TripleO::Services::CephClient + - OS::TripleO::Services::CephExternal + - OS::TripleO::Services::Timezone + - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Snmp + - OS::TripleO::Services::NovaCompute + - OS::TripleO::Services::NovaLibvirt + - OS::TripleO::Services::Kernel + - OS::TripleO::Services::ComputeNeutronCorePlugin + - OS::TripleO::Services::ComputeNeutronOvsAgent + - OS::TripleO::Services::ComputeCeilometerAgent + - OS::TripleO::Services::ComputeNeutronL3Agent + - OS::TripleO::Services::ComputeNeutronMetadataAgent + - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::TripleoFirewall + - OS::TripleO::Services::NeutronSriovAgent + - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::SensuClient + - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::VipHosts + - OS::TripleO::Services::CephOSD
\ No newline at end of file diff --git a/net-config-bond.yaml b/net-config-bond.yaml index ec881bdc..01f8ac1d 100644 --- a/net-config-bond.yaml +++ b/net-config-bond.yaml @@ -56,14 +56,6 @@ resources: type: ovs_bridge name: {get_input: bridge_name} use_dhcp: true - # Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284 - #ovs_extra: - # - list_join: - # - ' ' - # - - br-set-external-id - # - {get_input: bridge_name} - # - bridge-id - # - {get_input: bridge_name} members: - type: ovs_bond @@ -71,7 +63,6 @@ resources: use_dhcp: true ovs_options: {get_param: BondInterfaceOvsOptions} members: - # os-net-config translates nic1 => em1 (for example) - type: interface name: nic1 diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml index 4f7a19dc..318eca8a 100644 --- a/net-config-bridge.yaml +++ b/net-config-bridge.yaml @@ -45,14 +45,6 @@ resources: type: ovs_bridge name: {get_input: bridge_name} use_dhcp: true - # Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284 - #ovs_extra: - # - list_join: - # - ' ' - # - - br-set-external-id - # - {get_input: bridge_name} - # - bridge-id - # - {get_input: bridge_name} members: - type: interface diff --git a/net-config-static-bridge-with-external-dhcp.yaml b/net-config-static-bridge-with-external-dhcp.yaml index 6dbe5982..3ea4e6ab 100644 --- a/net-config-static-bridge-with-external-dhcp.yaml +++ b/net-config-static-bridge-with-external-dhcp.yaml @@ -68,15 +68,6 @@ resources: primary: true - type: interface - # would like to do the following, but can't b/c of: - # https://bugs.launchpad.net/heat/+bug/1344284 - # name: - # list_join: - # - '/' - # - - {get_input: bridge_name} - # - ':0' - # So, just hardcode to br-ex:0 for now, br-ex is hardcoded in - # controller.yaml anyway. name: br-ex:0 addresses: - diff --git a/network/config/bond-with-vlans/controller-v6.yaml b/network/config/bond-with-vlans/controller-v6.yaml index 1361d969..d45ab33c 100644 --- a/network/config/bond-with-vlans/controller-v6.yaml +++ b/network/config/bond-with-vlans/controller-v6.yaml @@ -115,7 +115,6 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: {get_param: EC2MetadataIp} - # IPv4 Default Route - default: true next_hop: {get_param: ControlPlaneDefaultRoute} @@ -144,7 +143,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} diff --git a/network/config/multiple-nics/compute.yaml b/network/config/multiple-nics/compute.yaml index 77514745..2e07d45e 100644 --- a/network/config/multiple-nics/compute.yaml +++ b/network/config/multiple-nics/compute.yaml @@ -122,7 +122,6 @@ resources: - ip_netmask: {get_param: InternalApiIpSubnet} - - # Create a bridge which can also be used for VLAN-mode bridge mapping type: ovs_bridge name: br-tenant use_dhcp: false @@ -134,7 +133,6 @@ resources: type: interface name: nic5 use_dhcp: false - # force the MAC address of the bridge to this interface primary: true # Uncomment when including environments/network-management.yaml # If setting default route on the Management interface, comment diff --git a/network/config/multiple-nics/controller-v6.yaml b/network/config/multiple-nics/controller-v6.yaml index da1f95f1..bbc89ab6 100644 --- a/network/config/multiple-nics/controller-v6.yaml +++ b/network/config/multiple-nics/controller-v6.yaml @@ -132,7 +132,6 @@ resources: - ip_netmask: {get_param: InternalApiIpSubnet} - - # Create a bridge which can also be used for VLAN-mode bridge mapping type: ovs_bridge name: br-tenant use_dhcp: false @@ -144,7 +143,6 @@ resources: type: interface name: nic5 use_dhcp: false - # force the MAC address of the bridge to this interface primary: true - type: ovs_bridge @@ -155,7 +153,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} @@ -163,7 +160,6 @@ resources: - type: interface name: nic6 - # force the MAC address of the bridge to this interface primary: true # Uncomment when including environments/network-management.yaml # If setting default route on the Management interface, comment diff --git a/network/config/multiple-nics/controller.yaml b/network/config/multiple-nics/controller.yaml index 7a1f9e5f..a0176b5b 100644 --- a/network/config/multiple-nics/controller.yaml +++ b/network/config/multiple-nics/controller.yaml @@ -126,7 +126,6 @@ resources: - ip_netmask: {get_param: InternalApiIpSubnet} - - # Create a bridge which can also be used for VLAN-mode bridge mapping type: ovs_bridge name: br-tenant use_dhcp: false @@ -138,7 +137,6 @@ resources: type: interface name: nic5 use_dhcp: false - # force the MAC address of the bridge to this interface primary: true - type: ovs_bridge @@ -156,7 +154,6 @@ resources: - type: interface name: nic6 - # force the MAC address of the bridge to this interface primary: true # Uncomment when including environments/network-management.yaml # If setting default route on the Management interface, comment diff --git a/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml b/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml index 80125149..a299d23e 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml +++ b/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml @@ -106,7 +106,6 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: {get_param: EC2MetadataIp} - # IPv4 Default Route - default: true next_hop: {get_param: ControlPlaneDefaultRoute} @@ -114,7 +113,6 @@ resources: - type: interface name: {get_input: interface_name} - # force the MAC address of the bridge to this interface primary: true - type: vlan @@ -124,7 +122,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} diff --git a/network/config/single-nic-linux-bridge-vlans/controller.yaml b/network/config/single-nic-linux-bridge-vlans/controller.yaml index aef5d4e3..bd97ccb0 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller.yaml +++ b/network/config/single-nic-linux-bridge-vlans/controller.yaml @@ -104,7 +104,6 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: {get_param: EC2MetadataIp} - # IPv4 Default Route - default: true next_hop: {get_param: ControlPlaneDefaultRoute} @@ -112,7 +111,6 @@ resources: - type: interface name: {get_input: interface_name} - # force the MAC address of the bridge to this interface primary: true - type: vlan @@ -122,7 +120,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} diff --git a/network/config/single-nic-vlans/controller-v6.yaml b/network/config/single-nic-vlans/controller-v6.yaml index ecbf2efb..bf5656ed 100644 --- a/network/config/single-nic-vlans/controller-v6.yaml +++ b/network/config/single-nic-vlans/controller-v6.yaml @@ -106,7 +106,6 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: {get_param: EC2MetadataIp} - # IPv4 Default Route - default: true next_hop: {get_param: ControlPlaneDefaultRoute} @@ -114,7 +113,6 @@ resources: - type: interface name: nic1 - # force the MAC address of the bridge to this interface primary: true - type: vlan @@ -123,7 +121,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml index 129f9b10..ba184ab0 100644 --- a/puppet/services/swift-proxy.yaml +++ b/puppet/services/swift-proxy.yaml @@ -100,6 +100,11 @@ outputs: - 'authtoken' - 'keystone' - 'staticweb' + - 'copy' + - 'container-quotas' + - 'account-quotas' + - 'slo' + - 'dlo' - 'versioned_writes' - 'ceilometer' - 'proxy-logging' |