summaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2019-04-26 17:43:34 -0400
committerTim Rozet <trozet@redhat.com>2019-04-26 17:51:55 -0400
commitea5f72e6594eb9cb98209f966e3b816002e76c14 (patch)
treee7d3465f1e225762dd10600dfadbfc45697009f0 /config/deploy
parent8f294ab694a95e60abb29af6f1ef560ae365d436 (diff)
Updates scenario files for hunter branch
Change-Id: I56d0df5810c04da59532b03a1b586db82a3aa0d7 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/os-nosdn-calipso_rocky-noha.yaml11
-rw-r--r--config/deploy/os-nosdn-nofeature-ha.yaml3
-rw-r--r--config/deploy/os-nosdn-nofeature-noha.yaml3
-rw-r--r--config/deploy/os-nosdn-rocky-ha.yaml11
-rw-r--r--config/deploy/os-nosdn-rocky-noha.yaml11
-rw-r--r--config/deploy/os-odl-bgpvpn_rocky-ha.yaml13
-rw-r--r--config/deploy/os-odl-bgpvpn_rocky-noha.yaml13
-rw-r--r--config/deploy/os-odl-rocky-ha.yaml13
-rw-r--r--config/deploy/os-odl-rocky-noha.yaml13
-rw-r--r--config/deploy/os-odl-sfc_rocky-ha.yaml13
-rw-r--r--config/deploy/os-odl-sfc_rocky-noha.yaml13
-rw-r--r--config/deploy/os-ovn-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-ovn-rocky-ha.yaml17
13 files changed, 4 insertions, 132 deletions
diff --git a/config/deploy/os-nosdn-calipso_rocky-noha.yaml b/config/deploy/os-nosdn-calipso_rocky-noha.yaml
deleted file mode 100644
index b14ceed..0000000
--- a/config/deploy/os-nosdn-calipso_rocky-noha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-global_params:
- ha_enabled: false
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: false
- sfc: false
- vpn: false
- calipso: true
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index d896a67..152a884 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -1,10 +1,9 @@
---
global_params:
ha_enabled: true
-
deploy_options:
containers: true
- os_version: master
+ os_version: rocky
sdn_controller: false
tacker: false
congress: false
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index 0725031..5fecfb6 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -1,10 +1,9 @@
---
global_params:
ha_enabled: false
-
deploy_options:
containers: true
- os_version: master
+ os_version: rocky
sdn_controller: false
tacker: false
congress: false
diff --git a/config/deploy/os-nosdn-rocky-ha.yaml b/config/deploy/os-nosdn-rocky-ha.yaml
deleted file mode 100644
index 152a884..0000000
--- a/config/deploy/os-nosdn-rocky-ha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-global_params:
- ha_enabled: true
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: false
- tacker: false
- congress: false
- sfc: false
- vpn: false
diff --git a/config/deploy/os-nosdn-rocky-noha.yaml b/config/deploy/os-nosdn-rocky-noha.yaml
deleted file mode 100644
index 5fecfb6..0000000
--- a/config/deploy/os-nosdn-rocky-noha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-global_params:
- ha_enabled: false
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: false
- tacker: false
- congress: false
- sfc: false
- vpn: false
diff --git a/config/deploy/os-odl-bgpvpn_rocky-ha.yaml b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml
deleted file mode 100644
index a0833fd..0000000
--- a/config/deploy/os-odl-bgpvpn_rocky-ha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
- ha_enabled: true
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: opendaylight
- odl_version: master
- tacker: false
- congress: false
- sfc: false
- vpn: true
diff --git a/config/deploy/os-odl-bgpvpn_rocky-noha.yaml b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml
deleted file mode 100644
index 6bc5adf..0000000
--- a/config/deploy/os-odl-bgpvpn_rocky-noha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
- ha_enabled: false
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: opendaylight
- odl_version: master
- tacker: false
- congress: false
- sfc: false
- vpn: true
diff --git a/config/deploy/os-odl-rocky-ha.yaml b/config/deploy/os-odl-rocky-ha.yaml
deleted file mode 100644
index 8728bd8..0000000
--- a/config/deploy/os-odl-rocky-ha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
- ha_enabled: true
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: opendaylight
- odl_version: oxygen
- tacker: false
- congress: false
- sfc: false
- vpn: false
diff --git a/config/deploy/os-odl-rocky-noha.yaml b/config/deploy/os-odl-rocky-noha.yaml
deleted file mode 100644
index f6ceb81..0000000
--- a/config/deploy/os-odl-rocky-noha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
- ha_enabled: false
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: opendaylight
- odl_version: oxygen
- tacker: false
- congress: false
- sfc: false
- vpn: false
diff --git a/config/deploy/os-odl-sfc_rocky-ha.yaml b/config/deploy/os-odl-sfc_rocky-ha.yaml
deleted file mode 100644
index 3a1b6c9..0000000
--- a/config/deploy/os-odl-sfc_rocky-ha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
- ha_enabled: true
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: opendaylight
- odl_version: master
- tacker: false
- congress: false
- sfc: true
- vpn: false
diff --git a/config/deploy/os-odl-sfc_rocky-noha.yaml b/config/deploy/os-odl-sfc_rocky-noha.yaml
deleted file mode 100644
index 8af873a..0000000
--- a/config/deploy/os-odl-sfc_rocky-noha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
- ha_enabled: false
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: opendaylight
- odl_version: master
- tacker: false
- congress: false
- sfc: true
- vpn: false
diff --git a/config/deploy/os-ovn-nofeature-ha.yaml b/config/deploy/os-ovn-nofeature-ha.yaml
index 6c42cad..a2c5a86 100644
--- a/config/deploy/os-ovn-nofeature-ha.yaml
+++ b/config/deploy/os-ovn-nofeature-ha.yaml
@@ -5,9 +5,11 @@ global_params:
undercloud:
- change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5
project: openstack/tripleo-common
+ branch: master
deploy_options:
containers: true
+ os_version: rocky
sdn_controller: ovn
tacker: false
congress: false
diff --git a/config/deploy/os-ovn-rocky-ha.yaml b/config/deploy/os-ovn-rocky-ha.yaml
deleted file mode 100644
index a2c5a86..0000000
--- a/config/deploy/os-ovn-rocky-ha.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-global_params:
- ha_enabled: true
- patches:
- undercloud:
- - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5
- project: openstack/tripleo-common
- branch: master
-
-deploy_options:
- containers: true
- os_version: rocky
- sdn_controller: ovn
- tacker: false
- congress: false
- sfc: false
- vpn: false