aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-21 19:41:04 +0000
committerGerrit Code Review <review@openstack.org>2016-01-21 19:41:04 +0000
commitfe2133fa8bfface39bdf132b55b692ac349a85e1 (patch)
tree27898be2fe33a34aeb227b00e4949390fe959d8a
parent566410cea8ea0cf96fc38287bf2fa581b06f66b2 (diff)
parent3770deda062b0bb3291fdfc57d7b5e000392f9ec (diff)
Merge "Add update yaml backward compatibe with PublicVirtualIP on ctlplane"
-rw-r--r--environments/updates/README.md3
-rw-r--r--environments/updates/update-from-publicvip-on-ctlplane.yaml2
2 files changed, 5 insertions, 0 deletions
diff --git a/environments/updates/README.md b/environments/updates/README.md
index 8c03411d..426d7329 100644
--- a/environments/updates/README.md
+++ b/environments/updates/README.md
@@ -7,3 +7,6 @@ Contents
**update-from-keystone-admin-internal-api.yaml**
To be used if the Keystone Admin API was originally deployed on the
Internal API network.
+
+**update-from-publicvip-on-ctlplane.yaml**
+ To be used if the PublicVirtualIP resource was deployed as an additional VIP on the 'ctlplane'.
diff --git a/environments/updates/update-from-publicvip-on-ctlplane.yaml b/environments/updates/update-from-publicvip-on-ctlplane.yaml
new file mode 100644
index 00000000..c62428b4
--- /dev/null
+++ b/environments/updates/update-from-publicvip-on-ctlplane.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+ OS::TripleO::Network::Ports::ExternalVipPort: ../../network/ports/ctlplane_vip.yaml \ No newline at end of file