From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: 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 --- config/deploy/os-nosdn-master_upstream-noha.yaml | 11 ----------- config/deploy/os-nosdn-nofeature-ha.yaml | 7 ++++--- config/deploy/os-nosdn-nofeature-noha.yaml | 7 ++++--- config/deploy/os-nosdn-pike_upstream-noha.yaml | 14 -------------- config/deploy/os-nosdn-queens-noha.yaml | 11 +++++++++++ config/deploy/os-nosdn-queens_upstream-noha.yaml | 11 ----------- config/deploy/os-odl-master_upstream-noha.yaml | 16 ---------------- config/deploy/os-odl-nofeature-ha.yaml | 13 +++++++++---- config/deploy/os-odl-nofeature-noha.yaml | 12 +++++++++--- config/deploy/os-odl-pike_upstream-noha.yaml | 12 ------------ config/deploy/os-odl-queens-noha.yaml | 16 ++++++++++++++++ config/deploy/os-odl-queens_upstream-noha.yaml | 16 ---------------- 12 files changed, 53 insertions(+), 93 deletions(-) delete mode 100644 config/deploy/os-nosdn-master_upstream-noha.yaml delete mode 100644 config/deploy/os-nosdn-pike_upstream-noha.yaml create mode 100644 config/deploy/os-nosdn-queens-noha.yaml delete mode 100644 config/deploy/os-nosdn-queens_upstream-noha.yaml delete mode 100644 config/deploy/os-odl-master_upstream-noha.yaml delete mode 100644 config/deploy/os-odl-pike_upstream-noha.yaml create mode 100644 config/deploy/os-odl-queens-noha.yaml delete mode 100644 config/deploy/os-odl-queens_upstream-noha.yaml (limited to 'config/deploy') 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 e7758113..00000000 --- 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 93a1fb6f..26d30e5e 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 77e5d5e2..e7758113 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 11417840..00000000 --- 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-noha.yaml b/config/deploy/os-nosdn-queens-noha.yaml new file mode 100644 index 00000000..efadc31e --- /dev/null +++ b/config/deploy/os-nosdn-queens-noha.yaml @@ -0,0 +1,11 @@ +--- +global_params: + ha_enabled: false +deploy_options: + containers: true + os_version: queens + 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_upstream-noha.yaml deleted file mode 100644 index efadc31e..00000000 --- a/config/deploy/os-nosdn-queens_upstream-noha.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -global_params: - ha_enabled: false -deploy_options: - containers: true - os_version: queens - sdn_controller: false - tacker: false - congress: false - sfc: false - vpn: false 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 39ced494..00000000 --- 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 4dd31e9e..24c200ff 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 271d2717..c7e82e51 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 3fe1c734..00000000 --- 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-noha.yaml b/config/deploy/os-odl-queens-noha.yaml new file mode 100644 index 00000000..75a7346c --- /dev/null +++ b/config/deploy/os-odl-queens-noha.yaml @@ -0,0 +1,16 @@ +--- +global_params: + ha_enabled: false + patches: + undercloud: + - change-id: Ie380cc41ca50a294a2647d673f339d02111bf6b3 + project: openstack/tripleo-heat-templates +deploy_options: + containers: true + os_version: queens + sdn_controller: opendaylight + odl_version: oxygen + 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_upstream-noha.yaml deleted file mode 100644 index 75a7346c..00000000 --- a/config/deploy/os-odl-queens_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: queens - sdn_controller: opendaylight - odl_version: oxygen - tacker: false - congress: false - sfc: false - vpn: false -- cgit 1.2.3-korg