Rename -puppet.yaml templates.

Updates the /puppet directory templates so that we drop the
'-puppet' from the filenames. This is redundant because
we already have puppet in the directory name and fixes
inconsistencies where we aren't using -puppet in
all the files within the puppet directory.

Depends-On: I71cb07b2f5305aaf9c43ab175cca976e844b8175

Change-Id: I70d6e048a566666f5d6e5c2407f8a6b4fd9f6f87

1 files changed, 0 insertions, 258 deletions

diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml
deleted file mode 100644
index 67617771..00000000
--- a/puppet/swift-storage-puppet.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-heat_template_version: 2015-04-30
-description: 'OpenStack swift storage node configured by Puppet'
-parameters:
-  Flavor:
-    description: Flavor for Swift storage nodes to request when deploying.
-    type: string
-    constraints:
-      - custom_constraint: nova.flavor
-  HashSuffix:
-    default: unset
-    description: A random string to be used as a salt when hashing to determine mappings
-      in the ring.
-    hidden: true
-    type: string
-  Image:
-    default: overcloud-swift-storage
-    type: string
-  KeyName:
-    default: default
-    description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    type: string
-  MountCheck:
-    default: 'false'
-    description: Value of mount_check in Swift account/container/object -server.conf
-    type: boolean
-  MinPartHours:
-    type: number
-    default: 1
-    description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
-  PartPower:
-    default: 10
-    description: Partition Power to use when building Swift rings
-    type: number
-  Replicas:
-    type: number
-    default: 3
-    description: How many replicas to use in the swift rings.
-  SnmpdReadonlyUserName:
-    default: ro_snmp_user
-    description: The user name for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-  SnmpdReadonlyUserPassword:
-    default: unset
-    description: The user password for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-    hidden: true
-  NtpServer:
-    type: string
-    default: ''
-  EnablePackageInstall:
-    default: 'false'
-    description: Set to true to enable package installation via Puppet
-    type: boolean
-  UpdateIdentifier:
-    default: ''
-    type: string
-    description: >
-      Setting to a previously unused value during stack-update will trigger
-      package update on all nodes
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  Hostname:
-    type: string
-    default: '' # Defaults to Heat created hostname
-  ExtraConfig:
-    default: {}
-    description: |
-      Additional hiera configuration to inject into the cluster. Note
-      that ObjectStorageExtraConfig takes precedence over ExtraConfig.
-    type: json
-  ObjectStorageExtraConfig:
-    default: {}
-    description: |
-      Role specific additional hiera configuration to inject into the cluster.
-    type: json
-
-
-resources:
-
-  SwiftStorage:
-    type: OS::Nova::Server
-    properties:
-      image: {get_param: Image}
-      flavor: {get_param: Flavor}
-      key_name: {get_param: KeyName}
-      networks:
-        - network: ctlplane
-      user_data_format: SOFTWARE_CONFIG
-      user_data: {get_resource: UserData}
-      name: {get_param: Hostname}
-
-  # Combine the NodeAdminUserData and NodeUserData mime archives
-  UserData:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: {get_resource: NodeAdminUserData}
-        type: multipart
-      - config: {get_resource: NodeUserData}
-        type: multipart
-
-  # Creates the "heat-admin" user if configured via the environment
-  # Should return a OS::Heat::MultipartMime reference via OS::stack_id
-  NodeAdminUserData:
-    type: OS::TripleO::NodeAdminUserData
-
-  # For optional operator additional userdata
-  # Should return a OS::Heat::MultipartMime reference via OS::stack_id
-  NodeUserData:
-    type: OS::TripleO::NodeUserData
-
-  InternalApiPort:
-    type: OS::TripleO::SwiftStorage::Ports::InternalApiPort
-    properties:
-      ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
-
-  StoragePort:
-    type: OS::TripleO::SwiftStorage::Ports::StoragePort
-    properties:
-      ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
-
-  StorageMgmtPort:
-    type: OS::TripleO::SwiftStorage::Ports::StorageMgmtPort
-    properties:
-      ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
-
-  NetworkConfig:
-    type: OS::TripleO::ObjectStorage::Net::SoftwareConfig
-    properties:
-      ControlPlaneIp: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
-      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
-      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
-      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
-
-  NetIpMap:
-    type: OS::TripleO::Network::Ports::NetIpMap
-    properties:
-      ControlPlaneIp: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
-      InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
-      StorageIp: {get_attr: [StoragePort, ip_address]}
-      StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}
-
-  NetworkDeployment:
-    type: OS::TripleO::SoftwareDeployment
-    properties:
-      config: {get_resource: NetworkConfig}
-      server: {get_resource: SwiftStorage}
-
-  SwiftStorageHieraConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: os-apply-config
-      config:
-        hiera:
-          hierarchy:
-            - heat_config_%{::deploy_config_name}
-            - object_extraconfig
-            - extraconfig
-            - object
-            - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
-            - all_nodes # provided by allNodesConfig
-            - '"%{::osfamily}"'
-            - common
-          datafiles:
-            common:
-              raw_data: {get_file: hieradata/common.yaml}
-            object_extraconfig:
-              mapped_data: {get_param: ObjectStorageExtraConfig}
-            extraconfig:
-              mapped_data: {get_param: ExtraConfig}
-            object:
-              raw_data: {get_file: hieradata/object.yaml}
-              mapped_data: # data supplied directly to this deployment configuration, etc
-                swift::swift_hash_suffix: { get_input: swift_hash_suffix }
-                tripleo::ringbuilder::part_power: { get_input: swift_part_power }
-                tripleo::ringbuilder::replicas: {get_input: swift_replicas }
-                # Swift
-                swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
-                swift_mount_check: {get_input: swift_mount_check }
-                tripleo::ringbuilder::min_part_hours: { get_input: swift_min_part_hours }
-                ntp::servers: {get_input: ntp_servers}
-                # NOTE(dprince): build_ring support is currently not wired in.
-                # See: https://review.openstack.org/#/c/109225/
-                tripleo::ringbuilder::build_ring: True
-                snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
-                snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
-                tripleo::packages::enable_install: {get_input: enable_package_install}
-
-
-  SwiftStorageHieraDeploy:
-    type: OS::Heat::StructuredDeployment
-    depends_on: NetworkDeployment
-    properties:
-      server: {get_resource: SwiftStorage}
-      config: {get_resource: SwiftStorageHieraConfig}
-      input_values:
-        local_ip: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
-        snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
-        snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
-        swift_hash_suffix: {get_param: HashSuffix}
-        swift_mount_check: {get_param: MountCheck}
-        swift_min_part_hours: {get_param: MinPartHours}
-        swift_part_power: {get_param: PartPower}
-        swift_replicas: { get_param: Replicas}
-        ntp_servers:
-          str_replace:
-            template: '["server"]'
-            params:
-              server: {get_param: NtpServer}
-        enable_package_install: {get_param: EnablePackageInstall}
-        swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
-
-  UpdateConfig:
-    type: OS::TripleO::Tasks::PackageUpdate
-
-  UpdateDeployment:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config: {get_resource: UpdateConfig}
-      server: {get_resource: SwiftStorage}
-      input_values:
-        update_identifier:
-          get_param: UpdateIdentifier
-
-outputs:
-  hosts_entry:
-    value:
-      str_replace:
-        template: "IP HOST.localdomain HOST"
-        params:
-          IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ObjectStorageHostnameResolveNetwork]}]}
-          HOST: {get_attr: [SwiftStorage, name]}
-  nova_server_resource:
-    description: Heat resource handle for the swift storage server
-    value:
-      {get_resource: SwiftStorage}
-  swift_device:
-    description: Swift device formatted for swift-ring-builder
-    value:
-      str_replace:
-        template: 'r1z1-IP:%PORT%/d1'
-        params:
-          IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
-  internal_api_ip_address:
-    description: IP address of the server in the internal_api network
-    value: {get_attr: [InternalApiPort, ip_address]}
-  storage_ip_address:
-    description: IP address of the server in the storage network
-    value: {get_attr: [StoragePort, ip_address]}
-  storage_mgmt_ip_address:
-    description: IP address of the server in the storage_mgmt network
-    value: {get_attr: [StorageMgmtPort, ip_address]}
-  config_identifier:
-    description: identifier which changes if the node configuration may need re-applying
-    value: {get_attr: [SwiftStorageHieraDeploy, deploy_stdout]}