diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-12 17:32:56 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-11-06 04:35:02 +0000 |
| commit | b3c610b205f88dddb02cdac39638c52eafaaf82c (patch) | |
| tree | 4826027e2d968e61c8024d972f3665ff3a8a09d7 /build/network-environment.yaml | |
| parent | 3c7556eb0734706f28588fb952eedea2d424c6d2 (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 'build/network-environment.yaml')
| -rw-r--r-- | build/network-environment.yaml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/build/network-environment.yaml b/build/network-environment.yaml index 247dd27b..3fd22e3d 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -59,15 +59,6 @@ resource_registry: OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml - # Services - OS::TripleO::Services::SwiftStorage: OS::Heat::None - OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::SwiftProxy: OS::Heat::None - - # Extra Config - OS::TripleO::ComputeExtraConfigPre: OS::Heat::None - OS::TripleO::ControllerExtraConfigPre: OS::Heat::None - parameter_defaults: NeutronExternalNetworkBridge: 'br-ex' |