diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-08 19:56:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-08 19:56:53 +0000 |
commit | 22a8fab24af11d495d6d8adceb770482cdf57058 (patch) | |
tree | 03d869594d75fafbfc559f9aeac395161ac960ad /deployed-server/deployed-server.yaml | |
parent | db229cd82c86bcadc5cd5290f3a2e107770d0bf1 (diff) | |
parent | 9450cc222df49f3679cb179fdfdc04e22d39fa0b (diff) |
Merge "Make deployed-server OS::Neutron::Port optional"
Diffstat (limited to 'deployed-server/deployed-server.yaml')
-rw-r--r-- | deployed-server/deployed-server.yaml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 81941047..da5698e5 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -94,16 +94,9 @@ resources: server: {get_resource: deployed-server} ControlPlanePort: - type: OS::Neutron::Port + type: OS::TripleO::DeployedServer::ControlPlanePort properties: - network: ctlplane - name: - list_join: - - '-' - - - {get_attr: [HostsEntryDeployment, hostname]} - - ctlplane - - port - replacement_policy: AUTO + Hostname: {get_attr: [HostsEntryDeployment, hostname]} outputs: # FIXME(shardy) this is needed because TemplateResource returns an @@ -113,7 +106,7 @@ outputs: networks: value: ctlplane: - - {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]} + - {get_attr: [ControlPlanePort, ip_address]} name: value: {get_attr: [HostsEntryDeployment, hostname]} hosts_entry: |