From f6dbb3929d904b4d5a9ee01f8270051e29ac1ec3 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 4 Dec 2017 11:20:23 -0500 Subject: Enables containerized overcloud deployments Changes Include: - For upstream deployments, Docker local registry will be updated with latest current RDO containers, regular deployments will use latest stable - Upstream container images will then be patched/modified and then re-uploaded into local docker registry with 'apex' tag - Deployment command modified to deploy with containers - Adds a --no-fetch deployment argument to disable pulling latest from upstream, and instead using what already exists in cache - Moves Undercloud NAT setup to just after undercloud is installed. This provides internet during overcloud install which is now required for upstream container deployments. - Creates loop device for Ceph deployment when no device is provided in deploy settings (for container deployment only) - Updates NIC J2 template to use the new format in OOO since the os-apply-config method is now deprecated in > Queens JIRA: APEX-566 JIRA: APEX-549 Change-Id: I0652c194c059b915a942ac7401936e8f5c69d1fa Signed-off-by: Tim Rozet --- config/deploy/deploy_settings.yaml | 3 +++ config/deploy/os-nosdn-master_upstream-noha.yaml | 11 +++++++++++ config/deploy/os-nosdn-pike-noha.yaml | 14 -------------- config/deploy/os-nosdn-pike_upstream-noha.yaml | 14 ++++++++++++++ config/deploy/os-nosdn-queens_upstream-noha.yaml | 11 +++++++++++ config/deploy/os-odl-master_upstream-noha.yaml | 16 ++++++++++++++++ config/deploy/os-odl-pike-noha.yaml | 15 --------------- config/deploy/os-odl-pike_upstream-noha.yaml | 12 ++++++++++++ config/deploy/os-odl-queens_upstream-noha.yaml | 16 ++++++++++++++++ 9 files changed, 83 insertions(+), 29 deletions(-) create mode 100644 config/deploy/os-nosdn-master_upstream-noha.yaml delete mode 100644 config/deploy/os-nosdn-pike-noha.yaml create mode 100644 config/deploy/os-nosdn-pike_upstream-noha.yaml create mode 100644 config/deploy/os-nosdn-queens_upstream-noha.yaml create mode 100644 config/deploy/os-odl-master_upstream-noha.yaml delete mode 100644 config/deploy/os-odl-pike-noha.yaml create mode 100644 config/deploy/os-odl-pike_upstream-noha.yaml create mode 100644 config/deploy/os-odl-queens_upstream-noha.yaml (limited to 'config/deploy') diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index a6721b4a..b8f01006 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -15,6 +15,9 @@ global_params: ipxe: true deploy_options: + # Whether or not to use containers for the overcloud services + containers: true + # Which SDN controller to use. Valid options are 'opendaylight', 'onos', # 'opendaylight-external', 'opencontrail' or false. A value of false will # use Neutron's OVS ML2 controller. diff --git a/config/deploy/os-nosdn-master_upstream-noha.yaml b/config/deploy/os-nosdn-master_upstream-noha.yaml new file mode 100644 index 00000000..e7758113 --- /dev/null +++ b/config/deploy/os-nosdn-master_upstream-noha.yaml @@ -0,0 +1,11 @@ +--- +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-pike-noha.yaml b/config/deploy/os-nosdn-pike-noha.yaml deleted file mode 100644 index 11417840..00000000 --- a/config/deploy/os-nosdn-pike-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-pike_upstream-noha.yaml b/config/deploy/os-nosdn-pike_upstream-noha.yaml new file mode 100644 index 00000000..11417840 --- /dev/null +++ b/config/deploy/os-nosdn-pike_upstream-noha.yaml @@ -0,0 +1,14 @@ +--- +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_upstream-noha.yaml new file mode 100644 index 00000000..efadc31e --- /dev/null +++ b/config/deploy/os-nosdn-queens_upstream-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-odl-master_upstream-noha.yaml b/config/deploy/os-odl-master_upstream-noha.yaml new file mode 100644 index 00000000..39ced494 --- /dev/null +++ b/config/deploy/os-odl-master_upstream-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: master + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-pike-noha.yaml b/config/deploy/os-odl-pike-noha.yaml deleted file mode 100644 index 44eff664..00000000 --- a/config/deploy/os-odl-pike-noha.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -global_params: - ha_enabled: false - patches: - undercloud: - - change-id: I301370fbf47a71291614dd60e4c64adc7b5ebb42 - project: openstack/tripleo-heat-templates -deploy_options: - os_version: pike - sdn_controller: opendaylight - odl_version: carbon - 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 new file mode 100644 index 00000000..3fe1c734 --- /dev/null +++ b/config/deploy/os-odl-pike_upstream-noha.yaml @@ -0,0 +1,12 @@ +--- +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_upstream-noha.yaml new file mode 100644 index 00000000..75a7346c --- /dev/null +++ b/config/deploy/os-odl-queens_upstream-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 -- cgit 1.2.3-korg