aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/services/aodh-api.yaml1
-rw-r--r--docker/services/aodh-evaluator.yaml1
-rw-r--r--docker/services/aodh-listener.yaml1
-rw-r--r--docker/services/aodh-notifier.yaml1
-rw-r--r--docker/services/database/mongodb.yaml1
-rw-r--r--docker/services/database/mysql.yaml1
-rw-r--r--docker/services/database/redis.yaml1
-rw-r--r--docker/services/glance-api.yaml1
-rw-r--r--docker/services/gnocchi-api.yaml1
-rw-r--r--docker/services/gnocchi-metricd.yaml1
-rw-r--r--docker/services/gnocchi-statsd.yaml1
-rw-r--r--docker/services/heat-api-cfn.yaml1
-rw-r--r--docker/services/heat-api.yaml1
-rw-r--r--docker/services/heat-engine.yaml1
-rw-r--r--docker/services/ironic-api.yaml1
-rw-r--r--docker/services/ironic-conductor.yaml1
-rw-r--r--docker/services/ironic-pxe.yaml1
-rw-r--r--docker/services/keystone.yaml1
-rw-r--r--docker/services/memcached.yaml1
-rw-r--r--docker/services/mistral-api.yaml1
-rw-r--r--docker/services/mistral-engine.yaml1
-rw-r--r--docker/services/mistral-executor.yaml1
-rw-r--r--docker/services/neutron-api.yaml1
-rw-r--r--docker/services/neutron-dhcp.yaml1
-rw-r--r--docker/services/neutron-l3.yaml1
-rw-r--r--docker/services/neutron-ovs-agent.yaml1
-rw-r--r--docker/services/neutron-plugin-ml2.yaml1
-rw-r--r--docker/services/nova-api.yaml1
-rw-r--r--docker/services/nova-compute.yaml1
-rw-r--r--docker/services/nova-conductor.yaml1
-rw-r--r--docker/services/nova-ironic.yaml1
-rw-r--r--docker/services/nova-libvirt.yaml1
-rw-r--r--docker/services/nova-metadata.yaml2
-rw-r--r--docker/services/nova-placement.yaml1
-rw-r--r--docker/services/nova-scheduler.yaml1
-rw-r--r--docker/services/panko-api.yaml1
-rw-r--r--docker/services/rabbitmq.yaml1
-rw-r--r--docker/services/services.yaml1
-rw-r--r--docker/services/swift-proxy.yaml1
-rw-r--r--docker/services/swift-ringbuilder.yaml1
-rw-r--r--docker/services/swift-storage.yaml1
-rw-r--r--docker/services/zaqar.yaml1
-rw-r--r--environments/neutron-ml2-cisco-nexus-ucsm.yaml2
-rw-r--r--puppet/objectstorage-role.yaml2
-rw-r--r--puppet/services/disabled/ceilometer-expirer.yaml1
-rw-r--r--puppet/services/kernel.yaml29
46 files changed, 75 insertions, 2 deletions
diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 9ba0ec03..8a02d8fd 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index b4036c00..9d514d0c 100644
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 61153089..dac61087 100644
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml
index 11ca12f9..a22ae85e 100644
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 437e6c82..ed4e3177 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index cc9f6eab..3a4de24f 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
MysqlRootPassword:
type: string
hidden: true
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index fbf53cb9..86c44900 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index c474131d..ef1e00ed 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 4770533b..9b474731 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml
index 9ddc3afb..2724805b 100644
--- a/docker/services/gnocchi-metricd.yaml
+++ b/docker/services/gnocchi-metricd.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index 99a94960..305971f1 100644
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index 6cfc8ecc..2631928f 100644
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@@ -38,6 +38,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 9c0ec23c..b2f4eb64 100644
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -38,6 +38,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index 02f7febe..8c554a50 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 8d2f6221..300aa0bd 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 70367615..360eb669 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
index baf03c0f..bc828e65 100644
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 86ef094c..ca643749 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
AdminPassword:
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
type: string
diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index 38a75d2d..d85a0878 100644
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index e5e2ff0b..3b256fdd 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
index feef9c81..d60d847b 100644
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 90415874..76ae052b 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index 485b02e6..e14cc87d 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -38,6 +38,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index 68d9994e..841ad646 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -38,6 +38,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 83dae627..e14868e2 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index ac52b378..1ea1a393 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -28,6 +28,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index 66a1397c..357dcde2 100644
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 627d1b48..d571b21b 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 540e831a..4f10a1a3 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -28,6 +28,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index 1a0e8641..131355d7 100644
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 668cbf00..be0dd111 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -32,6 +32,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index cc0640de..ebf0da7d 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -34,6 +34,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml
index 95d781c7..2aebbb2f 100644
--- a/docker/services/nova-metadata.yaml
+++ b/docker/services/nova-metadata.yaml
@@ -25,7 +25,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
-
+ type: json
resources:
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 528a20ea..ae4ccf68 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index bcd9f7b5..6285e98e 100644
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@@ -37,6 +37,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index b2abc068..46cfa5ab 100644
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@ -35,6 +35,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index 92c8d9f6..e2f8228e 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
RabbitCookie:
type: string
default: ''
diff --git a/docker/services/services.yaml b/docker/services/services.yaml
index 31def7f3..15f1bf02 100644
--- a/docker/services/services.yaml
+++ b/docker/services/services.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 988bb399..60972f91 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index f98e23fd..9ced8f27 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -28,6 +28,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index f99eb068..017fb123 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -39,6 +39,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index 744a0c1e..594df693 100644
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -33,6 +33,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
index ad111757..f5a0a399 100644
--- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
@@ -2,6 +2,8 @@
# a Cisco Neutron plugin.
resource_registry:
OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
+ OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
NetworkUCSMIp: '127.0.0.1'
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index 84b646a2..fb60d2be 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -127,7 +127,7 @@ parameters:
resources:
SwiftStorage:
- type: OS::Nova::ObjectStorageServer
+ type: OS::TripleO::ObjectStorageServer
metadata:
os-collect-config:
command: {get_param: ConfigCommand}
diff --git a/puppet/services/disabled/ceilometer-expirer.yaml b/puppet/services/disabled/ceilometer-expirer.yaml
index 560cc582..182193ec 100644
--- a/puppet/services/disabled/ceilometer-expirer.yaml
+++ b/puppet/services/disabled/ceilometer-expirer.yaml
@@ -20,6 +20,7 @@ parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml
index 697ec228..8121454b 100644
--- a/puppet/services/kernel.yaml
+++ b/puppet/services/kernel.yaml
@@ -34,6 +34,28 @@ parameters:
default: 0
description: Configures sysctl net.ipv6.{default/all}.disable_ipv6 keys
type: number
+ NeighbourGcThreshold1:
+ default: 1024
+ description: Configures sysctl net.ipv4.neigh.default.gc_thresh1 value.
+ This is the minimum number of entries to keep in the ARP
+ cache. The garbage collector will not run if there are
+ fewer than this number of entries in the cache.
+ type: number
+ NeighbourGcThreshold2:
+ default: 2048
+ description: Configures sysctl net.ipv4.neigh.default.gc_thresh2 value.
+ This is the soft maximum number of entries to keep in the
+ ARP cache. The garbage collector will allow the number of
+ entries to exceed this for 5 seconds before collection will
+ be performed.
+ type: number
+ NeighbourGcThreshold3:
+ default: 4096
+ description: Configures sysctl net.ipv4.neigh.default.gc_thresh3 value.
+ This is the hard maximum number of entries to keep in the
+ ARP cache. The garbage collector will always run if there
+ are more than this number of entries in the cache.
+ type: number
outputs:
role_data:
@@ -94,5 +116,12 @@ outputs:
value: 1
fs.suid_dumpable:
value: 0
+ #avoid neighbour table overflow on large deployments
+ net.ipv4.neigh.default.gc_thresh1:
+ value: {get_param: NeighbourGcThreshold1}
+ net.ipv4.neigh.default.gc_thresh2:
+ value: {get_param: NeighbourGcThreshold2}
+ net.ipv4.neigh.default.gc_thresh3:
+ value: {get_param: NeighbourGcThreshold3}
step_config: |
include ::tripleo::profile::base::kernel