Merge "Add NodeAdminUserData interface for "heat-admin" user"

diff --combined overcloud-resource-registry-puppet.yaml
index ba1b6f7,39d752f..ecb1162
--- 1/overcloud-resource-registry-puppet.yaml
--- 2/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@@ -23,6 -23,10 +23,10 @@@ resource_registry
    OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
    OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
  
+   # This creates the "heat-admin" user for all OS images by default
+   # To disable, replace with firstboot/userdata_default.yaml
+   OS::TripleO::NodeAdminUserData: firstboot/userdata_heat_admin.yaml
+ 
    # Hooks for operator extra config
    # NodeUserData == Cloud-init additional user-data, e.g cloud-config
    # ControllerExtraConfigPre == Controller configuration pre service deployment
@@@ -44,7 -48,6 +48,7 @@@
    OS::TripleO::Network::Tenant: network/noop.yaml
  
    OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml
 +  OS::TripleO::Network::Ports::NetIpSubnetMap: network/ports/net_ip_subnet_map.yaml
    OS::TripleO::Network::Ports::NetIpListMap: network/ports/net_ip_list_map.yaml
  
    # Port assignments for the controller role

diff --combined puppet/ceph-storage-puppet.yaml
index 6a1ed50,db73f03..f08b83c
--- 1/puppet/ceph-storage-puppet.yaml
--- 2/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@@@ -66,9 -66,26 +66,26 @@@ resources
        networks:
          - network: ctlplane
        user_data_format: SOFTWARE_CONFIG
-       user_data: {get_resource: NodeUserData}
+       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
  
@@@ -91,16 -108,14 +108,16 @@@
    NetIpMap:
      type: OS::TripleO::Network::Ports::NetIpMap
      properties:
 +      ControlPlaneIp: {get_attr: [CephStorage, networks, ctlplane, 0]}
        StorageIp: {get_attr: [StoragePort, ip_address]}
        StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}
  
    NetIpSubnetMap:
 -    type: OS::TripleO::Network::Ports::NetIpMap
 +    type: OS::TripleO::Network::Ports::NetIpSubnetMap
      properties:
 -      StorageIp: {get_attr: [StoragePort, ip_subnet]}
 -      StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_subnet]}
 +      ControlPlaneIp: {get_attr: [CephStorage, networks, ctlplane, 0]}
 +      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
 +      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
  
    NetworkDeployment:
      type: OS::TripleO::SoftwareDeployment
@@@ -121,8 -136,8 +138,8 @@@
              params:
                server: {get_param: NtpServer}
          enable_package_install: {get_param: EnablePackageInstall}
 -        ceph_cluster_network: {get_attr: [NetIpSubnetMap, net_ip_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
 -        ceph_public_network: {get_attr: [NetIpSubnetMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
 +        ceph_cluster_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
 +        ceph_public_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
  
    CephStorageConfig:
      type: OS::Heat::StructuredConfig

diff --combined puppet/cinder-storage-puppet.yaml
index df6ec34,403ce9c..d764c6f
--- 1/puppet/cinder-storage-puppet.yaml
--- 2/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@@ -120,9 -120,26 +120,26 @@@ resources
        networks:
          - network: ctlplane
        user_data_format: SOFTWARE_CONFIG
-       user_data: {get_resource: NodeUserData}
+       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
  
@@@ -151,7 -168,6 +168,7 @@@
    NetIpMap:
      type: OS::TripleO::Network::Ports::NetIpMap
      properties:
 +      ControlPlaneIp: {get_attr: [BlockStorage, networks, ctlplane, 0]}
        InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
        StorageIp: {get_attr: [StoragePort, ip_address]}
        StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}

diff --combined puppet/compute-puppet.yaml
index 0e6db3d,6648073..10e7527
--- 1/puppet/compute-puppet.yaml
--- 2/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@@ -70,12 -70,9 +70,12 @@@ parameters
      default: default
      constraints:
        - custom_constraint: nova.keypair
 -  KeystoneHost:
 +  KeystoneAdminApiVirtualIP:
      type: string
      default: ''
 +  KeystonePublicApiVirtualIP:
 +     type: string
 +     default: ''
    NeutronBridgeMappings:
      description: >
        The OVS logical->physical bridge mappings to use. See the Neutron
@@@ -263,9 -260,26 +263,26 @@@ resources
        networks:
          - network: ctlplane
        user_data_format: SOFTWARE_CONFIG
-       user_data: {get_resource: NodeUserData}
+       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
  
@@@ -287,7 -301,6 +304,7 @@@
    NetIpMap:
      type: OS::TripleO::Network::Ports::NetIpMap
      properties:
 +      ControlPlaneIp: {get_attr: [NovaCompute, networks, ctlplane, 0]}
        InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
        StorageIp: {get_attr: [StoragePort, ip_address]}
        TenantIp: {get_attr: [TenantPort, ip_address]}
@@@ -414,7 -427,7 +431,7 @@@
            list_join:
              - ''
              - - 'http://'
 -              - {get_param: KeystoneHost}
 +              - {get_param: KeystonePublicApiVirtualIP}
                - ':5000/v2.0'
          snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
          snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
@@@ -475,7 -488,7 +492,7 @@@
            list_join:
              - ''
              - - 'http://'
 -              - {get_param: NeutronHost}
 +              - {get_param: KeystoneAdminApiVirtualIP}
                - ':35357/v2.0'
          admin_password: {get_param: AdminPassword}
          rabbit_username: {get_param: RabbitUserName}

diff --combined puppet/controller-puppet.yaml
index a69c22e,ce33d1c..07ed99d
--- 1/puppet/controller-puppet.yaml
--- 2/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@@ -491,9 -491,6 +491,9 @@@ parameters
    MysqlVirtualIP:
      type: string
      default: ''
 +  KeystoneAdminApiVirtualIP:
 +    type: string
 +    default: ''
    KeystonePublicApiVirtualIP:
      type: string
      default: ''
@@@ -531,9 -528,26 +531,26 @@@ resources
        networks:
          - network: ctlplane
        user_data_format: SOFTWARE_CONFIG
-       user_data: {get_resource: NodeUserData}
+       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
  
@@@ -565,7 -579,6 +582,7 @@@
    NetIpMap:
      type: OS::TripleO::Network::Ports::NetIpMap
      properties:
 +      ControlPlaneIp: {get_attr: [Controller, networks, ctlplane, 0]}
        ExternalIp: {get_attr: [ExternalPort, ip_address]}
        InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
        StorageIp: {get_attr: [StoragePort, ip_address]}
@@@ -573,14 -586,13 +590,14 @@@
        TenantIp: {get_attr: [TenantPort, ip_address]}
  
    NetIpSubnetMap:
 -    type: OS::TripleO::Network::Ports::NetIpMap
 +    type: OS::TripleO::Network::Ports::NetIpSubnetMap
      properties:
 -      ExternalIp: {get_attr: [ExternalPort, ip_subnet]}
 -      InternalApiIp: {get_attr: [InternalApiPort, ip_subnet]}
 -      StorageIp: {get_attr: [StoragePort, ip_subnet]}
 -      StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_subnet]}
 -      TenantIp: {get_attr: [TenantPort, ip_subnet]}
 +      ControlPlaneIp: {get_attr: [Controller, networks, ctlplane, 0]}
 +      ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
 +      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
 +      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
 +      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
 +      TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
  
    NetworkConfig:
      type: OS::TripleO::Controller::Net::SoftwareConfig
@@@ -700,7 -712,7 +717,7 @@@
            list_join:
              - ''
              - - 'http://'
 -              - {get_param: KeystonePublicApiVirtualIP}
 +              - {get_param: KeystoneAdminApiVirtualIP}
                - ':35357/'
          keystone_auth_uri:
            list_join:
@@@ -786,7 -798,7 +803,7 @@@
            list_join:
              - ''
              - - 'http://'
 -              - {get_param: KeystonePublicApiVirtualIP}
 +              - {get_param: KeystoneAdminApiVirtualIP}
                - ':35357/v2.0'
          ceilometer_backend: {get_param: CeilometerBackend}
          ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
@@@ -866,8 -878,8 +883,8 @@@
          memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
          mysql_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
          mysql_virtual_ip: {get_param: MysqlVirtualIP}
 -        ceph_cluster_network: {get_attr: [NetIpSubnetMap, net_ip_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
 -        ceph_public_network: {get_attr: [NetIpSubnetMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
 +        ceph_cluster_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
 +        ceph_public_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
          ceph_public_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
  
    # Map heat metadata into hiera datafiles

diff --combined puppet/swift-storage-puppet.yaml
index edec104,5ed63bb..5c4ff5a
--- 1/puppet/swift-storage-puppet.yaml
--- 2/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@@@ -89,9 -89,26 +89,26 @@@ resources
        networks:
          - network: ctlplane
        user_data_format: SOFTWARE_CONFIG
-       user_data: {get_resource: NodeUserData}
+       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
  
@@@ -120,7 -137,6 +137,7 @@@
    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]}