summaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-05-02 12:34:38 -0400
committerTim Rozet <trozet@redhat.com>2018-05-21 10:36:05 -0400
commitd2913d4bcc0fcd25dc3d01f6604049dfd0a9217d (patch)
tree5cf7a0d04cbf8b30488bb18ba7ee79e215f08e47 /config/deploy
parent22bc385f5b2e25694699a614268aaad2fdacbb12 (diff)
Migrates master to use direct upstream
We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/os-nosdn-master_upstream-noha.yaml11
-rw-r--r--config/deploy/os-nosdn-nofeature-ha.yaml7
-rw-r--r--config/deploy/os-nosdn-nofeature-noha.yaml7
-rw-r--r--config/deploy/os-nosdn-pike_upstream-noha.yaml14
-rw-r--r--config/deploy/os-nosdn-queens-noha.yaml (renamed from config/deploy/os-nosdn-queens_upstream-noha.yaml)0
-rw-r--r--config/deploy/os-odl-master_upstream-noha.yaml16
-rw-r--r--config/deploy/os-odl-nofeature-ha.yaml13
-rw-r--r--config/deploy/os-odl-nofeature-noha.yaml12
-rw-r--r--config/deploy/os-odl-pike_upstream-noha.yaml12
-rw-r--r--config/deploy/os-odl-queens-noha.yaml (renamed from config/deploy/os-odl-queens_upstream-noha.yaml)0
10 files changed, 26 insertions, 66 deletions
diff --git a/config/deploy/os-nosdn-master_upstream-noha.yaml b/config/deploy/os-nosdn-master_upstream-noha.yaml
deleted file mode 100644
index e775811..0000000
--- a/config/deploy/os-nosdn-master_upstream-noha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-global_params:
- ha_enabled: false
-deploy_options:
- containers: true
- os_version: master
- sdn_controller: false
- tacker: false
- congress: false
- sfc: false
- vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 93a1fb6..26d30e5 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -1,10 +1,11 @@
---
global_params:
ha_enabled: true
-
deploy_options:
+ containers: true
+ os_version: master
sdn_controller: false
- tacker: true
- congress: true
+ tacker: false
+ congress: false
sfc: false
vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index 77e5d5e..e775811 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -1,10 +1,11 @@
---
global_params:
ha_enabled: false
-
deploy_options:
+ containers: true
+ os_version: master
sdn_controller: false
- tacker: true
- congress: true
+ tacker: false
+ congress: false
sfc: false
vpn: false
diff --git a/config/deploy/os-nosdn-pike_upstream-noha.yaml b/config/deploy/os-nosdn-pike_upstream-noha.yaml
deleted file mode 100644
index 1141784..0000000
--- a/config/deploy/os-nosdn-pike_upstream-noha.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-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-nosdn-queens_upstream-noha.yaml b/config/deploy/os-nosdn-queens-noha.yaml
index efadc31..efadc31 100644
--- a/config/deploy/os-nosdn-queens_upstream-noha.yaml
+++ b/config/deploy/os-nosdn-queens-noha.yaml
diff --git a/config/deploy/os-odl-master_upstream-noha.yaml b/config/deploy/os-odl-master_upstream-noha.yaml
deleted file mode 100644
index 39ced49..0000000
--- a/config/deploy/os-odl-master_upstream-noha.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-global_params:
- ha_enabled: false
- patches:
- undercloud:
- - change-id: Ie380cc41ca50a294a2647d673f339d02111bf6b3
- project: openstack/tripleo-heat-templates
-deploy_options:
- containers: true
- os_version: master
- sdn_controller: opendaylight
- odl_version: master
- tacker: false
- congress: false
- sfc: false
- vpn: false
diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index 4dd31e9..24c200f 100644
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -1,11 +1,16 @@
---
global_params:
ha_enabled: true
-
+ patches:
+ undercloud:
+ - change-id: I3431d2ec724a880baf0de8f586490d145bedf870
+ project: openstack/python-tripleoclient
deploy_options:
+ containers: true
+ os_version: master
sdn_controller: opendaylight
- odl_version: nitrogen
- tacker: true
- congress: true
+ odl_version: master
+ tacker: false
+ congress: false
sfc: false
vpn: false
diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index 271d271..c7e82e5 100644
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -1,11 +1,17 @@
---
global_params:
ha_enabled: false
+ patches:
+ undercloud:
+ - change-id: I3431d2ec724a880baf0de8f586490d145bedf870
+ project: openstack/python-tripleoclient
deploy_options:
+ containers: true
+ os_version: master
sdn_controller: opendaylight
- odl_version: nitrogen
- tacker: true
- congress: true
+ odl_version: master
+ tacker: false
+ congress: false
sfc: false
vpn: false
diff --git a/config/deploy/os-odl-pike_upstream-noha.yaml b/config/deploy/os-odl-pike_upstream-noha.yaml
deleted file mode 100644
index 3fe1c73..0000000
--- a/config/deploy/os-odl-pike_upstream-noha.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-global_params:
- ha_enabled: false
-deploy_options:
- containers: false
- os_version: pike
- sdn_controller: opendaylight
- odl_version: carbon
- tacker: false
- congress: false
- sfc: false
- vpn: false
diff --git a/config/deploy/os-odl-queens_upstream-noha.yaml b/config/deploy/os-odl-queens-noha.yaml
index 75a7346..75a7346 100644
--- a/config/deploy/os-odl-queens_upstream-noha.yaml
+++ b/config/deploy/os-odl-queens-noha.yaml