Merge "Change Collectd ports type to numbers." into stable/train

deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

@@ -49,11 +49,10 @@ parameters:
     default: 'overcloud-ceilometer-agent-notification'
     type: string
   MetricsQdrPort:
-    default: '5666'
+    default: 5666
     description: Service name or port number on which the qdrouterd will accept
-                 connections. This argument must be string, even if the numeric
-                 form is used.
-    type: string
+                 connections.
+    type: number
   CeilometerQdrPublishEvents:
     default: false
     description: Whether to send events to MetricsQdr service.

deployment/metrics/collectd-container-puppet.yaml

@@ -45,11 +45,10 @@ parameters:
     description: Keystone region for endpoint
     default: 'regionOne'
   MetricsQdrPort:
-    default: '5666'
+    default: 5666
     description: Service name or port number on which the qdrouterd will accept
-                 connections. This argument must be string, even if the numeric
-                 form is used.
-    type: string
+                 connections.
+    type: number
   MetricsQdrUsername:
     default: 'guest'
     description: Username which should be used to authenticate to the deployed
@@ -239,12 +238,12 @@ parameters:
     description: Hostname or IP address of the AMQP 1.0 intermediary.
     default: nil
   CollectdAmqpPort:
-    type: string
+    type: number
     description: >
       Service name or port number on which the AMQP 1.0 intermediary accepts
       connections. This argument must be a string, even if the numeric form
       is used.
-    default: '5666'
+    default: 5666
   CollectdAmqpUser:
     type: string
     description: >

deployment/metrics/qdr-container-puppet.yaml

@@ -45,11 +45,10 @@ parameters:
       tag: openstack.nova.consoleauth
       file: /var/log/containers/qdrouterd/metrics-qdr.log
   MetricsQdrPort:
-    default: '5666'
+    default: 5666
     description: Service name or port number on which the qdrouterd will accept
-                 connections. This argument must be string, even if the numeric
-                 form is used.
-    type: string
+                 connections.
+    type: number
   MetricsQdrUsername:
     default: 'guest'
     description: Username which should be used to authenticate to the deployed