summaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-12 17:32:56 -0400
committerTim Rozet <trozet@redhat.com>2017-11-06 04:35:02 +0000
commitb3c610b205f88dddb02cdac39638c52eafaaf82c (patch)
tree4826027e2d968e61c8024d972f3665ff3a8a09d7 /config/deploy
parent3c7556eb0734706f28588fb952eedea2d424c6d2 (diff)
Adds ability to deploy from upstream openstack
To deploy with upstream openstack branch, use new deploy setting 'os_version'. A default scenario file for nosdn with pike has been included in this patch. If 'os_version' is a version other than the default version for this OPNFV release, then upstream is used. In order to use upstream with the current OS version use '--upstream' argument to the deploy command, to force an upstream deployment. Also include '-e upstream-environment.yaml' to use default upstream deployment settings. Supports nosdn and odl-nofeature deployments. Change-Id: Ic07e308827b449637b4e86cdd086434e4de2fb69 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/os-nosdn-pike-noha.yaml14
-rw-r--r--config/deploy/os-odl-pike-noha.yaml15
2 files changed, 29 insertions, 0 deletions
diff --git a/config/deploy/os-nosdn-pike-noha.yaml b/config/deploy/os-nosdn-pike-noha.yaml
new file mode 100644
index 0000000..1141784
--- /dev/null
+++ b/config/deploy/os-nosdn-pike-noha.yaml
@@ -0,0 +1,14 @@
+---
+global_params:
+ ha_enabled: false
+ patches:
+ undercloud:
+ - change-id: I301370fbf47a71291614dd60e4c64adc7b5ebb42
+ project: openstack/tripleo-heat-templates
+deploy_options:
+ os_version: pike
+ sdn_controller: false
+ tacker: false
+ congress: false
+ sfc: false
+ vpn: false
diff --git a/config/deploy/os-odl-pike-noha.yaml b/config/deploy/os-odl-pike-noha.yaml
new file mode 100644
index 0000000..44eff66
--- /dev/null
+++ b/config/deploy/os-odl-pike-noha.yaml
@@ -0,0 +1,15 @@
+---
+global_params:
+ ha_enabled: false
+ patches:
+ undercloud:
+ - change-id: I301370fbf47a71291614dd60e4c64adc7b5ebb42
+ project: openstack/tripleo-heat-templates
+deploy_options:
+ os_version: pike
+ sdn_controller: opendaylight
+ odl_version: carbon
+ tacker: false
+ congress: false
+ sfc: false
+ vpn: false