summaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-09-28 16:01:13 -0400
committerTim Rozet <trozet@redhat.com>2018-09-28 16:29:08 -0400
commitdf388a8afedc29f9cfebdab3cc39ef27f93d9612 (patch)
treeeb54545f1013e7861509e166d4edd1445e97d640 /config/deploy
parentee58a24647df8eec2418735b038e5035bdffe10d (diff)
Migrates from queens to rocky
For now we need to retain the ability to deploy odl-queens for CSIT. Change-Id: Idea550ff5e7aeb230aa93d3575de11e5e9656302 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/common-patches.yaml15
-rw-r--r--config/deploy/os-nosdn-calipso_rocky-noha.yaml (renamed from config/deploy/os-nosdn-calipso_queens-noha.yaml)2
-rw-r--r--config/deploy/os-nosdn-rocky-ha.yaml (renamed from config/deploy/os-nosdn-queens-ha.yaml)2
-rw-r--r--config/deploy/os-nosdn-rocky-noha.yaml (renamed from config/deploy/os-nosdn-queens-noha.yaml)2
-rw-r--r--config/deploy/os-odl-bgpvpn_rocky-ha.yaml (renamed from config/deploy/os-odl-bgpvpn_queens-ha.yaml)2
-rw-r--r--config/deploy/os-odl-bgpvpn_rocky-noha.yaml (renamed from config/deploy/os-odl-bgpvpn_queens-noha.yaml)2
-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.yaml (renamed from config/deploy/os-odl-sfc_queens-ha.yaml)2
-rw-r--r--config/deploy/os-odl-sfc_rocky-noha.yaml (renamed from config/deploy/os-odl-sfc_queens-noha.yaml)2
-rw-r--r--config/deploy/os-ovn-rocky-ha.yaml (renamed from config/deploy/os-ovn-queens-ha.yaml)2
11 files changed, 49 insertions, 8 deletions
diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml
index ac006bd..d408a16 100644
--- a/config/deploy/common-patches.yaml
+++ b/config/deploy/common-patches.yaml
@@ -11,6 +11,21 @@ patches:
project: openstack/puppet-tripleo
- change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7
project: openstack/puppet-tripleo
+ rocky:
+ undercloud:
+ - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+ project: openstack/tripleo-common
+ branch: master
+ - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395
+ project: openstack/tripleo-common
+ branch: master
+ overcloud:
+ - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+ project: openstack/puppet-tripleo
+ branch: master
+ - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7
+ project: openstack/puppet-tripleo
+ branch: master
queens:
undercloud:
- change-id: I966bf7f6f8d1cbc656abfad59e8bb927e1aa53c2
diff --git a/config/deploy/os-nosdn-calipso_queens-noha.yaml b/config/deploy/os-nosdn-calipso_rocky-noha.yaml
index 48d93f4..b14ceed 100644
--- a/config/deploy/os-nosdn-calipso_queens-noha.yaml
+++ b/config/deploy/os-nosdn-calipso_rocky-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: false
sfc: false
vpn: false
diff --git a/config/deploy/os-nosdn-queens-ha.yaml b/config/deploy/os-nosdn-rocky-ha.yaml
index 88a4004..152a884 100644
--- a/config/deploy/os-nosdn-queens-ha.yaml
+++ b/config/deploy/os-nosdn-rocky-ha.yaml
@@ -3,7 +3,7 @@ global_params:
ha_enabled: true
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: false
tacker: false
congress: false
diff --git a/config/deploy/os-nosdn-queens-noha.yaml b/config/deploy/os-nosdn-rocky-noha.yaml
index efadc31..5fecfb6 100644
--- a/config/deploy/os-nosdn-queens-noha.yaml
+++ b/config/deploy/os-nosdn-rocky-noha.yaml
@@ -3,7 +3,7 @@ global_params:
ha_enabled: false
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: false
tacker: false
congress: false
diff --git a/config/deploy/os-odl-bgpvpn_queens-ha.yaml b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml
index 27a0caf..a0833fd 100644
--- a/config/deploy/os-odl-bgpvpn_queens-ha.yaml
+++ b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: opendaylight
odl_version: master
tacker: false
diff --git a/config/deploy/os-odl-bgpvpn_queens-noha.yaml b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml
index 3338230..6bc5adf 100644
--- a/config/deploy/os-odl-bgpvpn_queens-noha.yaml
+++ b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: opendaylight
odl_version: master
tacker: false
diff --git a/config/deploy/os-odl-rocky-ha.yaml b/config/deploy/os-odl-rocky-ha.yaml
new file mode 100644
index 0000000..8728bd8
--- /dev/null
+++ b/config/deploy/os-odl-rocky-ha.yaml
@@ -0,0 +1,13 @@
+---
+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
new file mode 100644
index 0000000..f6ceb81
--- /dev/null
+++ b/config/deploy/os-odl-rocky-noha.yaml
@@ -0,0 +1,13 @@
+---
+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_queens-ha.yaml b/config/deploy/os-odl-sfc_rocky-ha.yaml
index 0cd0146..3a1b6c9 100644
--- a/config/deploy/os-odl-sfc_queens-ha.yaml
+++ b/config/deploy/os-odl-sfc_rocky-ha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: opendaylight
odl_version: master
tacker: false
diff --git a/config/deploy/os-odl-sfc_queens-noha.yaml b/config/deploy/os-odl-sfc_rocky-noha.yaml
index d091b8c..8af873a 100644
--- a/config/deploy/os-odl-sfc_queens-noha.yaml
+++ b/config/deploy/os-odl-sfc_rocky-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: opendaylight
odl_version: master
tacker: false
diff --git a/config/deploy/os-ovn-queens-ha.yaml b/config/deploy/os-ovn-rocky-ha.yaml
index fe79068..a2c5a86 100644
--- a/config/deploy/os-ovn-queens-ha.yaml
+++ b/config/deploy/os-ovn-rocky-ha.yaml
@@ -9,7 +9,7 @@ global_params:
deploy_options:
containers: true
- os_version: queens
+ os_version: rocky
sdn_controller: ovn
tacker: false
congress: false