Merge "Drop unused puppet/services parameters"

deployment/cinder/cinder-backend-pure-puppet.yaml

@@ -60,14 +60,6 @@ parameters:
     default: 'iSCSI'
   CinderPureSanIp:
     type: string
-  CinderPureAPIToken:
-    type: string
-  CinderPureUseChap:
-    type: boolean
-    default: false
-  CinderPureMultipathXfer:
-    type: boolean
-    default: true
 
 outputs:
   role_data:

puppet/services/designate-api.yaml

@@ -41,11 +41,6 @@ parameters:
   MonitoringSubscriptionDesignateApi:
     default: 'overcloud-designate-api'
     type: string
-  DesignateApiLoggingSource:
-    type: json
-    default:
-      tag: openstack.designate.api
-      path: /var/log/designate/api.log
   DesignateWorkers:
     default: 0
     description: Number of workers for Designate services.

puppet/services/designate-central.yaml

@@ -32,11 +32,6 @@ parameters:
   MonitoringSubscriptionDesignateCentral:
     default: 'overcloud-designate-central'
     type: string
-  DesignateCentralLoggingSource:
-    type: json
-    default:
-      tag: openstack.designate.central
-      path: /var/log/designate/designate-central.log
   DesignateWorkers:
     default: 0
     description: Number of workers for Designate services.

puppet/services/designate-mdns.yaml

@@ -32,11 +32,6 @@ parameters:
   MonitoringSubscriptionDesignateMiniDNS:
     default: 'overcloud-designate-mdns'
     type: string
-  DesignateMiniDNSLoggingSource:
-    type: json
-    default:
-      tag: openstack.designate.mdns
-      path: /var/log/designate/designate-mdns.log
   DesignateWorkers:
     default: 0
     description: Number of workers for Designate services.

puppet/services/designate-producer.yaml

@@ -32,11 +32,6 @@ parameters:
   MonitoringSubscriptionDesignateProducer:
     default: 'overcloud-designate-producer'
     type: string
-  DesignateProducerLoggingSource:
-    type: json
-    default:
-      tag: openstack.designate.producer
-      path: /var/log/designate/designate-producer.log
   DesignateWorkers:
     default: 0
     description: Number of workers for Designate services.

puppet/services/designate-sink.yaml

@@ -32,11 +32,6 @@ parameters:
   MonitoringSubscriptionDesignateSink:
     default: 'overcloud-designate-sink'
     type: string
-  DesignateSinkLoggingSource:
-    type: json
-    default:
-      tag: openstack.designate.sink
-      path: /var/log/designate/designate-sink.log
   DesignateWorkers:
     default: 0
     description: Number of workers for Designate services.

puppet/services/designate-worker.yaml

@@ -32,11 +32,6 @@ parameters:
   MonitoringSubscriptionDesignateWorker:
     default: 'overcloud-designate-worker'
     type: string
-  DesignateWorkerLoggingSource:
-    type: json
-    default:
-      tag: openstack.designate.worker
-      path: /var/log/designate/designate-worker.log
   DesignateWorkers:
     default: 0
     description: Number of workers for Designate services.

puppet/services/manila-scheduler.yaml

@@ -38,10 +38,6 @@ parameters:
     description: The password for the neutron service and db account, used by neutron agents.
     type: string
     hidden: true
-  ManilaPassword:
-    description: The password for the manila service account.
-    type: string
-    hidden: true
   MonitoringSubscriptionManilaScheduler:
     default: 'overcloud-manila-scheduler'
     type: string

puppet/services/neutron-l3-compute-dvr.yaml

@@ -31,10 +31,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  Debug:
-    type: boolean
-    default: false
-    description: Set to True to enable debugging on all services.
   MonitoringSubscriptionNeutronL3Dvr:
     default: 'overcloud-neutron-l3-dvr'
     type: string

puppet/services/opendaylight-api.yaml

@@ -16,9 +16,6 @@ parameters:
     description: List of features to install with ODL
     type: comma_delimited_list
     default: ["odl-netvirt-openstack","odl-jolokia"]
-  OpenDaylightApiVirtualIP:
-    type: string
-    default: ''
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set

puppet/services/opendaylight-ovs.yaml

@@ -16,9 +16,6 @@ parameters:
     description: URL postfix to verify ODL has finished starting up
     type: string
     default: 'diagstatus'
-  OpenDaylightApiVirtualIP:
-    type: string
-    default: ''
   OpenDaylightProviderMappings:
     description: Mappings between logical networks and physical interfaces.
                  Required for VLAN deployments.  For example physnet1 -> eth1.

puppet/services/ovn-metadata.yaml

@@ -63,11 +63,6 @@ parameters:
   MonitoringSubscriptionOvnMetadata:
     default: 'overcloud-ovn-metadata'
     type: string
-  OvnMetadataAgentLoggingSource:
-    type: json
-    default:
-      tag: openstack.neutron.agent.ovn-metadata
-      path: /var/log/neutron/networking-ovn-metadata-agent.log
   Debug:
     type: boolean
     default: false

puppet/services/pacemaker.yaml

@@ -97,10 +97,6 @@ parameters:
         \[(?<pid>[^ ]*)\]
         (?<host>[^ ]*)
         (?<message>.*)$/
-  EnableLoadBalancer:
-    default: true
-    description: Whether to deploy a LoadBalancer on the Controller
-    type: boolean
 
 outputs:
   role_data:

puppet/services/swift-proxy.yaml

@@ -30,10 +30,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  Debug:
-    default: false
-    description: Set to True to enable debugging on all services.
-    type: boolean
   SwiftPassword:
     description: The password for the swift service account
     type: string

puppet/services/swift-storage.yaml

@@ -30,10 +30,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  Debug:
-    default: false
-    description: Set to True to enable debugging on all services.
-    type: boolean
   SwiftMountCheck:
     default: false
     description: Value of mount_check in Swift account/container/object -server.conf

puppet/services/tripleo-ui.yaml

@@ -33,12 +33,6 @@ parameters:
   EnableInternalTLS:
     type: boolean
     default: false
-  TripleoUILoggingSource:
-    type: json
-    default:
-      tag: openstack.tripleo.ui
-      # FIXME(mandre)
-      path: /var/log/tripleo/ui.log
   NovaCorsAllowedOrigin:
     type: string
     default: ''