Merge "Synchronize NetworkDeployment inputs for generic roles"

diff --cc puppet/role.role.j2.yaml
index 1f43277,cd29b09..acb7677
--- 1/puppet/role.role.j2.yaml
--- 2/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@@ -351,31 -336,13 +355,34 @@@ resources
        config: {get_resource: NetworkConfig}
        server: {get_resource: {{role}}}
        actions: {get_param: NetworkDeploymentActions}
+       input_values:
+         bridge_name: br-ex
+         interface_name: {get_param: NeutronPublicInterface}
  
 +  {{role}}UpgradeInitConfig:
 +    type: OS::Heat::SoftwareConfig
 +    properties:
 +      group: script
 +      config:
 +        list_join:
 +        - ''
 +        - - "#!/bin/bash\n\n"
 +          - "if [[ -f /etc/resolv.conf.save ]] ; then rm /etc/resolv.conf.save; fi\n\n"
 +          - get_param: UpgradeInitCommand
 +
 +  # Note we may be able to make this conditional on UpgradeInitCommandNotEmpty
 +  # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first
 +  {{role}}UpgradeInitDeployment:
 +    type: OS::Heat::SoftwareDeployment
 +    depends_on: NetworkDeployment
 +    properties:
 +      name: {{role}}UpgradeInitDeployment
 +      server: {get_resource: {{role}}}
 +      config: {get_resource: {{role}}UpgradeInitConfig}
 +
    {{role}}Deployment:
      type: OS::Heat::StructuredDeployment
 -    depends_on: NetworkDeployment
 +    depends_on: {{role}}UpgradeInitDeployment
      properties:
        name: {{role}}Deployment
        config: {get_resource: {{role}}Config}