From 3cd4d0898ab517634d8c485d9e216150800f7828 Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Tue, 2 Oct 2018 11:36:14 -0500 Subject: [PATCH] Upgrade default from newton to ocata This patch set moves the default deployment to ocata from newton. Newton zuul job is now moved into its separate job. Change-Id: Ic534c8ee02179f23c7855d93a4707e5a2fd77354 Signed-off-by: Tin Lam --- .zuul.yaml | 16 ++-- barbican/values.yaml | 18 ++-- cinder/values.yaml | 24 +++--- congress/values.yaml | 22 ++--- doc/source/devref/images.rst | 22 ++--- glance/values.yaml | 18 ++-- heat/values.yaml | 24 +++--- horizon/values.yaml | 8 +- ironic/values.yaml | 26 +++--- keystone/values.yaml | 22 ++--- magnum/values.yaml | 18 ++-- mistral/values.yaml | 22 ++--- neutron/values.yaml | 30 +++---- nova/values.yaml | 42 +++++----- rally/values.yaml | 14 ++-- senlin/values.yaml | 22 ++--- tempest/values.yaml | 4 +- .../developer/common/170-setup-gateway.sh | 2 +- tools/overrides/releases/newton/loci.yaml | 82 +++++++++++++++++++ 19 files changed, 259 insertions(+), 177 deletions(-) create mode 100644 tools/overrides/releases/newton/loci.yaml diff --git a/.zuul.yaml b/.zuul.yaml index a8d821c386..7032501de7 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -35,9 +35,9 @@ - openstack-helm-armada-fullstack-deploy: voting: false - openstack-helm-kolla-deploy-ceph-ovs - - openstack-helm-ocata-loci-deploy-ceph: + - openstack-helm-newton-loci-deploy-ceph: voting: false - - openstack-helm-ocata-kolla-deploy-ceph: + - openstack-helm-newton-kolla-deploy-ceph: voting: false - openstack-helm-pike-loci-deploy-ceph: voting: false @@ -206,18 +206,18 @@ run: tools/gate/playbooks/dev-deploy-ceph.yaml - job: - name: openstack-helm-ocata-loci-deploy-ceph + name: openstack-helm-newton-loci-deploy-ceph vars: - osh_openstack_release: ocata - zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/ocata/loci.yaml + osh_openstack_release: newton + zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/newton/loci.yaml parent: openstack-helm-dev-deploy run: tools/gate/playbooks/dev-deploy-ceph.yaml - job: - name: openstack-helm-ocata-kolla-deploy-ceph + name: openstack-helm-newton-kolla-deploy-ceph vars: - osh_openstack_release: ocata - zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/ocata/kolla.yaml + osh_openstack_release: newton + zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/newton/kolla.yaml parent: openstack-helm-dev-deploy run: tools/gate/playbooks/dev-deploy-ceph.yaml diff --git a/barbican/values.yaml b/barbican/values.yaml index be1db1677a..7ff18a39c9 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -30,16 +30,16 @@ release_group: null images: tags: - bootstrap: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - scripted_test: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton - barbican_db_sync: docker.io/openstackhelm/barbican:newton - db_drop: docker.io/openstackhelm/heat:newton - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - barbican_api: docker.io/openstackhelm/barbican:newton + scripted_test: docker.io/openstackhelm/heat:ocata + db_init: docker.io/openstackhelm/heat:ocata + barbican_db_sync: docker.io/openstackhelm/barbican:ocata + db_drop: docker.io/openstackhelm/heat:ocata + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + barbican_api: docker.io/openstackhelm/barbican:ocata rabbit_init: docker.io/rabbitmq:3.7-management image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/cinder/values.yaml b/cinder/values.yaml index 36eead0806..019938aae0 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -44,20 +44,20 @@ release_group: null images: tags: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/openstackhelm/heat:newton - cinder_db_sync: docker.io/openstackhelm/cinder:newton - db_drop: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:ocata + cinder_db_sync: docker.io/openstackhelm/cinder:ocata + db_drop: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - cinder_api: docker.io/openstackhelm/cinder:newton - bootstrap: docker.io/openstackhelm/heat:newton - cinder_scheduler: docker.io/openstackhelm/cinder:newton - cinder_volume: docker.io/openstackhelm/cinder:newton - cinder_volume_usage_audit: docker.io/openstackhelm/cinder:newton + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + cinder_api: docker.io/openstackhelm/cinder:ocata + bootstrap: docker.io/openstackhelm/heat:ocata + cinder_scheduler: docker.io/openstackhelm/cinder:ocata + cinder_volume: docker.io/openstackhelm/cinder:ocata + cinder_volume_usage_audit: docker.io/openstackhelm/cinder:ocata cinder_storage_init: docker.io/port/ceph-config-helper:v1.10.3 - cinder_backup: docker.io/openstackhelm/cinder:newton + cinder_backup: docker.io/openstackhelm/cinder:ocata cinder_backup_storage_init: docker.io/port/ceph-config-helper:v1.10.3 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 diff --git a/congress/values.yaml b/congress/values.yaml index 044d9d1877..b0afb48cfb 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -38,18 +38,18 @@ release_group: null images: tags: - congress_api: docker.io/openstackhelm/congress:newton - congress_datasource: docker.io/openstackhelm/congress:newton - congress_policy_engine: docker.io/openstackhelm/congress:newton - db_init: docker.io/openstackhelm/heat:newton - congress_db_sync: docker.io/openstackhelm/congress:newton - db_drop: docker.io/openstackhelm/heat:newton + congress_api: docker.io/openstackhelm/congress:ocata + congress_datasource: docker.io/openstackhelm/congress:ocata + congress_policy_engine: docker.io/openstackhelm/congress:ocata + db_init: docker.io/openstackhelm/heat:ocata + congress_db_sync: docker.io/openstackhelm/congress:ocata + db_drop: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - congress_ds_create: docker.io/openstackhelm/congress:newton - congress_scripted_test: docker.io/openstackhelm/congress:newton + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + congress_ds_create: docker.io/openstackhelm/congress:ocata + congress_scripted_test: docker.io/openstackhelm/congress:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/doc/source/devref/images.rst b/doc/source/devref/images.rst index e081833f93..42ffb0d2fa 100644 --- a/doc/source/devref/images.rst +++ b/doc/source/devref/images.rst @@ -57,17 +57,17 @@ chart: images: tags: - bootstrap: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton - db_sync: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - db_drop: docker.io/openstackhelm/heat:newton - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - api: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - engine: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata + db_init: docker.io/openstackhelm/heat:ocata + db_sync: docker.io/kolla/ubuntu-source-heat-api:ocata + db_drop: docker.io/openstackhelm/heat:ocata + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + api: docker.io/kolla/ubuntu-source-heat-api:ocata + cfn: docker.io/kolla/ubuntu-source-heat-api:ocata + cloudwatch: docker.io/kolla/ubuntu-source-heat-api:ocata + engine: docker.io/openstackhelm/heat:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 pull_policy: "IfNotPresent" diff --git a/glance/values.yaml b/glance/values.yaml index 20f31725c5..5897a2099d 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -40,17 +40,17 @@ images: tags: test: docker.io/kolla/ubuntu-source-rally:4.0.0 glance_storage_init: docker.io/port/ceph-config-helper:v1.10.3 - db_init: docker.io/openstackhelm/heat:newton - glance_db_sync: docker.io/openstackhelm/glance:newton - db_drop: docker.io/openstackhelm/heat:newton - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:ocata + glance_db_sync: docker.io/openstackhelm/glance:ocata + db_drop: docker.io/openstackhelm/heat:ocata + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - glance_api: docker.io/openstackhelm/glance:newton - glance_registry: docker.io/openstackhelm/glance:newton + glance_api: docker.io/openstackhelm/glance:ocata + glance_registry: docker.io/openstackhelm/glance:ocata # Bootstrap image requires curl - bootstrap: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/heat/values.yaml b/heat/values.yaml index 13fa2beca7..6c19656d38 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -42,19 +42,19 @@ labels: images: tags: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - bootstrap: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton - heat_db_sync: docker.io/openstackhelm/heat:newton - db_drop: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata + db_init: docker.io/openstackhelm/heat:ocata + heat_db_sync: docker.io/openstackhelm/heat:ocata + db_drop: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - heat_api: docker.io/openstackhelm/heat:newton - heat_cfn: docker.io/openstackhelm/heat:newton - heat_cloudwatch: docker.io/openstackhelm/heat:newton - heat_engine: docker.io/openstackhelm/heat:newton - heat_engine_cleaner: docker.io/openstackhelm/heat:newton + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + heat_api: docker.io/openstackhelm/heat:ocata + heat_cfn: docker.io/openstackhelm/heat:ocata + heat_cloudwatch: docker.io/openstackhelm/heat:ocata + heat_engine: docker.io/openstackhelm/heat:ocata + heat_engine_cleaner: docker.io/openstackhelm/heat:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/horizon/values.yaml b/horizon/values.yaml index 3044609fbd..65d93b4d59 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -19,10 +19,10 @@ images: tags: - db_init: docker.io/openstackhelm/heat:newton - horizon_db_sync: docker.io/openstackhelm/horizon:newton - db_drop: docker.io/openstackhelm/heat:newton - horizon: docker.io/openstackhelm/horizon:newton + db_init: docker.io/openstackhelm/heat:ocata + horizon_db_sync: docker.io/openstackhelm/horizon:ocata + db_drop: docker.io/openstackhelm/heat:ocata + horizon: docker.io/openstackhelm/horizon:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/ironic/values.yaml b/ironic/values.yaml index 6fd7499dc4..aeb2348f58 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -32,21 +32,21 @@ labels: images: tags: - ironic_manage_cleaning_network: docker.io/openstackhelm/heat:newton - ironic_retrive_cleaning_network: docker.io/openstackhelm/heat:newton - ironic_retrive_swift_config: docker.io/openstackhelm/heat:newton + ironic_manage_cleaning_network: docker.io/openstackhelm/heat:ocata + ironic_retrive_cleaning_network: docker.io/openstackhelm/heat:ocata + ironic_retrive_swift_config: docker.io/openstackhelm/heat:ocata # Bootstrap image requires curl - bootstrap: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton - ironic_db_sync: docker.io/openstackhelm/ironic:newton - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata + db_init: docker.io/openstackhelm/heat:ocata + ironic_db_sync: docker.io/openstackhelm/ironic:ocata + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ironic_api: docker.io/openstackhelm/ironic:newton - ironic_conductor: docker.io/openstackhelm/ironic:newton - ironic_pxe: docker.io/openstackhelm/ironic:newton - ironic_pxe_init: docker.io/openstackhelm/ironic:newton + ironic_api: docker.io/openstackhelm/ironic:ocata + ironic_conductor: docker.io/openstackhelm/ironic:ocata + ironic_pxe: docker.io/openstackhelm/ironic:ocata + ironic_pxe_init: docker.io/openstackhelm/ironic:ocata ironic_pxe_http: docker.io/nginx:1.13.3 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 diff --git a/keystone/values.yaml b/keystone/values.yaml index d41f1e63f6..53318e1a31 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -29,19 +29,19 @@ release_group: null images: tags: - bootstrap: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/openstackhelm/heat:newton - keystone_db_sync: docker.io/openstackhelm/keystone:newton - db_drop: docker.io/openstackhelm/heat:newton - ks_user: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:ocata + keystone_db_sync: docker.io/openstackhelm/keystone:ocata + db_drop: docker.io/openstackhelm/heat:ocata + ks_user: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - keystone_fernet_setup: docker.io/openstackhelm/keystone:newton - keystone_fernet_rotate: docker.io/openstackhelm/keystone:newton - keystone_credential_setup: docker.io/openstackhelm/keystone:newton - keystone_credential_rotate: docker.io/openstackhelm/keystone:newton - keystone_api: docker.io/openstackhelm/keystone:newton - keystone_domain_manage: docker.io/openstackhelm/keystone:newton + keystone_fernet_setup: docker.io/openstackhelm/keystone:ocata + keystone_fernet_rotate: docker.io/openstackhelm/keystone:ocata + keystone_credential_setup: docker.io/openstackhelm/keystone:ocata + keystone_credential_rotate: docker.io/openstackhelm/keystone:ocata + keystone_api: docker.io/openstackhelm/keystone:ocata + keystone_domain_manage: docker.io/openstackhelm/keystone:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/magnum/values.yaml b/magnum/values.yaml index 00fe95a14d..f6dc3376b4 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -32,16 +32,16 @@ labels: images: tags: - bootstrap: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton - magnum_db_sync: docker.io/openstackhelm/magnum:newton - db_drop: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata + db_init: docker.io/openstackhelm/heat:ocata + magnum_db_sync: docker.io/openstackhelm/magnum:ocata + db_drop: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - magnum_api: docker.io/openstackhelm/magnum:newton - magnum_conductor: docker.io/openstackhelm/magnum:newton + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + magnum_api: docker.io/openstackhelm/magnum:ocata + magnum_conductor: docker.io/openstackhelm/magnum:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/mistral/values.yaml b/mistral/values.yaml index d9e461e6e1..4a84f73fb4 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -42,19 +42,19 @@ release_group: null images: tags: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - bootstrap: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - db_init: docker.io/openstackhelm/heat:newton - mistral_db_sync: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 - db_drop: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:ocata + mistral_db_sync: docker.io/kolla/ubuntu-source-mistral-api:ocata + db_drop: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - mistral_api: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 - mistral_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 - mistral_event_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 - mistral_executor: docker.io/kolla/ubuntu-source-mistral-executor:3.0.3 + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + mistral_api: docker.io/kolla/ubuntu-source-mistral-api:ocata + mistral_engine: docker.io/kolla/ubuntu-source-mistral-engine:ocata + mistral_event_engine: docker.io/kolla/ubuntu-source-mistral-engine:ocata + mistral_executor: docker.io/kolla/ubuntu-source-mistral-executor:ocata image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" local_registry: diff --git a/neutron/values.yaml b/neutron/values.yaml index 03e37640eb..75690a64f4 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -21,23 +21,23 @@ release_group: null images: tags: - bootstrap: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/openstackhelm/heat:newton - neutron_db_sync: docker.io/openstackhelm/neutron:newton - db_drop: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:ocata + neutron_db_sync: docker.io/openstackhelm/neutron:ocata + db_drop: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - neutron_server: docker.io/openstackhelm/neutron:newton - neutron_dhcp: docker.io/openstackhelm/neutron:newton - neutron_metadata: docker.io/openstackhelm/neutron:newton - neutron_l3: docker.io/openstackhelm/neutron:newton - neutron_openvswitch_agent: docker.io/openstackhelm/neutron:newton - neutron_linuxbridge_agent: docker.io/openstackhelm/neutron:newton - neutron_sriov_agent: docker.io/openstackhelm/neutron:newton-sriov-1804 - neutron_sriov_agent_init: docker.io/openstackhelm/neutron:newton-sriov-1804 + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + neutron_server: docker.io/openstackhelm/neutron:ocata + neutron_dhcp: docker.io/openstackhelm/neutron:ocata + neutron_metadata: docker.io/openstackhelm/neutron:ocata + neutron_l3: docker.io/openstackhelm/neutron:ocata + neutron_openvswitch_agent: docker.io/openstackhelm/neutron:ocata + neutron_linuxbridge_agent: docker.io/openstackhelm/neutron:ocata + neutron_sriov_agent: docker.io/openstackhelm/neutron:ocata-sriov-1804 + neutron_sriov_agent_init: docker.io/openstackhelm/neutron:ocata-sriov-1804 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/nova/values.yaml b/nova/values.yaml index 025fcf14c1..2dd76cca5b 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -61,32 +61,32 @@ labels: images: pull_policy: IfNotPresent tags: - bootstrap: docker.io/openstackhelm/heat:newton - db_drop: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton + bootstrap: docker.io/openstackhelm/heat:ocata + db_drop: docker.io/openstackhelm/heat:ocata + db_init: docker.io/openstackhelm/heat:ocata dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1' rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - nova_api: docker.io/openstackhelm/nova:newton - nova_cell_setup: docker.io/openstackhelm/nova:newton - nova_cell_setup_init: docker.io/openstackhelm/heat:newton - nova_compute: docker.io/openstackhelm/nova:newton - nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:3.0.3' - nova_compute_ssh: docker.io/openstackhelm/nova:newton - nova_conductor: docker.io/openstackhelm/nova:newton - nova_consoleauth: docker.io/openstackhelm/nova:newton - nova_db_sync: docker.io/openstackhelm/nova:newton - nova_novncproxy: docker.io/openstackhelm/nova:newton - nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3' - nova_placement: docker.io/openstackhelm/nova:newton - nova_scheduler: docker.io/openstackhelm/nova:newton + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + nova_api: docker.io/openstackhelm/nova:ocata + nova_cell_setup: docker.io/openstackhelm/nova:ocata + nova_cell_setup_init: docker.io/openstackhelm/heat:ocata + nova_compute: docker.io/openstackhelm/nova:ocata + nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata' + nova_compute_ssh: docker.io/openstackhelm/nova:ocata + nova_conductor: docker.io/openstackhelm/nova:ocata + nova_consoleauth: docker.io/openstackhelm/nova:ocata + nova_db_sync: docker.io/openstackhelm/nova:ocata + nova_novncproxy: docker.io/openstackhelm/nova:ocata + nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:ocata' + nova_placement: docker.io/openstackhelm/nova:ocata + nova_scheduler: docker.io/openstackhelm/nova:ocata # NOTE(portdirect): we simply use the ceph config helper here, # as it has both oscli and jq. nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' - nova_spiceproxy: docker.io/openstackhelm/nova:newton - nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3' + nova_spiceproxy: docker.io/openstackhelm/nova:ocata + nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:ocata' test: 'docker.io/kolla/ubuntu-source-rally:4.0.0' image_repo_sync: docker.io/docker:17.07.0 local_registry: diff --git a/rally/values.yaml b/rally/values.yaml index a3102ee1a9..bd1ebb71c2 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -26,14 +26,14 @@ labels: images: tags: - bootstrap: docker.io/kolla/ubuntu-source-rally:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-rally:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - db_init: docker.io/kolla/ubuntu-source-rally:3.0.3 - rally_db_sync: docker.io/kolla/ubuntu-source-rally:3.0.3 - run_task: docker.io/kolla/ubuntu-source-rally:3.0.3 - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton + db_init: docker.io/kolla/ubuntu-source-rally:ocata + rally_db_sync: docker.io/kolla/ubuntu-source-rally:ocata + run_task: docker.io/kolla/ubuntu-source-rally:ocata + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" local_registry: diff --git a/senlin/values.yaml b/senlin/values.yaml index 2353ba7901..e6a3a0b891 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -35,18 +35,18 @@ release_group: null images: tags: - scripted_test: docker.io/openstackhelm/heat:newton - bootstrap: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton - senlin_db_sync: docker.io/openstackhelm/senlin:newton - db_drop: docker.io/openstackhelm/heat:newton + scripted_test: docker.io/openstackhelm/heat:ocata + bootstrap: docker.io/openstackhelm/heat:ocata + db_init: docker.io/openstackhelm/heat:ocata + senlin_db_sync: docker.io/openstackhelm/senlin:ocata + db_drop: docker.io/openstackhelm/heat:ocata rabbit_init: docker.io/rabbitmq:3.7-management - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - senlin_api: docker.io/openstackhelm/senlin:newton - senlin_engine: docker.io/openstackhelm/senlin:newton - senlin_engine_cleaner: docker.io/openstackhelm/senlin:newton + ks_user: docker.io/openstackhelm/heat:ocata + ks_service: docker.io/openstackhelm/heat:ocata + ks_endpoints: docker.io/openstackhelm/heat:ocata + senlin_api: docker.io/openstackhelm/senlin:ocata + senlin_engine: docker.io/openstackhelm/senlin:ocata + senlin_engine_cleaner: docker.io/openstackhelm/senlin:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/tempest/values.yaml b/tempest/values.yaml index 7ceb5f434b..01292ef4a7 100644 --- a/tempest/values.yaml +++ b/tempest/values.yaml @@ -25,8 +25,8 @@ labels: images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - tempest_run_tests: docker.io/kolla/ubuntu-source-tempest:3.0.3 - ks_user: docker.io/openstackhelm/heat:newton + tempest_run_tests: docker.io/kolla/ubuntu-source-tempest:4.0.3 + ks_user: docker.io/openstackhelm/heat:ocata image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" local_registry: diff --git a/tools/deployment/developer/common/170-setup-gateway.sh b/tools/deployment/developer/common/170-setup-gateway.sh index f2f3b03705..31b441d9d3 100755 --- a/tools/deployment/developer/common/170-setup-gateway.sh +++ b/tools/deployment/developer/common/170-setup-gateway.sh @@ -37,7 +37,7 @@ sudo docker run -d \ --cap-add=NET_ADMIN \ --volume /etc/kubernetes/kubelet-resolv.conf:/etc/kubernetes/kubelet-resolv.conf:ro \ --entrypoint dnsmasq \ - docker.io/openstackhelm/neutron:newton \ + docker.io/openstackhelm/neutron:ocata \ --keep-in-foreground \ --no-hosts \ --bind-interfaces \ diff --git a/tools/overrides/releases/newton/loci.yaml b/tools/overrides/releases/newton/loci.yaml new file mode 100644 index 0000000000..a8ba19be3e --- /dev/null +++ b/tools/overrides/releases/newton/loci.yaml @@ -0,0 +1,82 @@ +images: + tags: + barbican_api: 'docker.io/openstackhelm/barbican:newton' + barbican_db_sync: 'docker.io/openstackhelm/barbican:newton' + bootstrap: 'docker.io/openstackhelm/heat:newton' + cinder_api: 'docker.io/openstackhelm/cinder:newton' + cinder_backup: 'docker.io/openstackhelm/cinder:newton' + cinder_db_sync: 'docker.io/openstackhelm/cinder:newton' + cinder_scheduler: 'docker.io/openstackhelm/cinder:newton' + cinder_volume: 'docker.io/openstackhelm/cinder:newton' + cinder_volume_usage_audit: 'docker.io/openstackhelm/cinder:newton' + congress_api: 'docker.io/openstackhelm/congress:newton' + congress_datasource: 'docker.io/openstackhelm/congress:newton' + congress_db_sync: 'docker.io/openstackhelm/congress:newton' + congress_ds_create: 'docker.io/openstackhelm/congress:newton' + congress_policy_engine: 'docker.io/openstackhelm/congress:newton' + congress_scripted_test: 'docker.io/openstackhelm/congress:newton' + db_drop: 'docker.io/openstackhelm/heat:newton' + db_init: 'docker.io/openstackhelm/heat:newton' + glance_api: 'docker.io/openstackhelm/glance:newton' + glance_bootstrap: 'docker.io/openstackhelm/heat:newton' + glance_db_sync: 'docker.io/openstackhelm/glance:newton' + glance_registry: 'docker.io/openstackhelm/glance:newton' + heat_api: 'docker.io/openstackhelm/heat:newton' + heat_cfn: 'docker.io/openstackhelm/heat:newton' + heat_cloudwatch: 'docker.io/openstackhelm/heat:newton' + heat_db_sync: 'docker.io/openstackhelm/heat:newton' + heat_engine: 'docker.io/openstackhelm/heat:newton' + heat_engine_cleaner: 'docker.io/openstackhelm/heat:newton' + horizon: 'docker.io/openstackhelm/horizon:newton' + horizon_db_sync: 'docker.io/openstackhelm/horizon:newton' + ironic_api: 'docker.io/openstackhelm/ironic:newton' + ironic_bootstrap: 'docker.io/openstackhelm/ironic:newton' + ironic_conductor: 'docker.io/openstackhelm/ironic:newton' + ironic_db_sync: 'docker.io/openstackhelm/ironic:newton' + ironic_pxe: 'docker.io/openstackhelm/ironic:newton' + ironic_pxe_init: 'docker.io/openstackhelm/ironic:newton' + keystone_api: 'docker.io/openstackhelm/keystone:newton' + keystone_bootstrap: 'docker.io/openstackhelm/heat:newton' + keystone_credential_rotate: 'docker.io/openstackhelm/keystone:newton' + keystone_credential_setup: 'docker.io/openstackhelm/keystone:newton' + keystone_db_sync: 'docker.io/openstackhelm/keystone:newton' + keystone_domain_manage: 'docker.io/openstackhelm/keystone:newton' + keystone_fernet_rotate: 'docker.io/openstackhelm/keystone:newton' + keystone_fernet_setup: 'docker.io/openstackhelm/keystone:newton' + ks_endpoints: 'docker.io/openstackhelm/heat:newton' + ks_service: 'docker.io/openstackhelm/heat:newton' + ks_user: 'docker.io/openstackhelm/heat:newton' + magnum_api: 'docker.io/openstackhelm/magnum:newton' + magnum_conductor: 'docker.io/openstackhelm/magnum:newton' + magnum_db_sync: 'docker.io/openstackhelm/magnum:newton' + neutron_db_sync: 'docker.io/openstackhelm/neutron:newton' + neutron_dhcp: 'docker.io/openstackhelm/neutron:newton' + neutron_l3: 'docker.io/openstackhelm/neutron:newton' + neutron_linuxbridge_agent: 'docker.io/openstackhelm/neutron:newton' + neutron_metadata: 'docker.io/openstackhelm/neutron:newton' + neutron_openvswitch_agent: 'docker.io/openstackhelm/neutron:newton' + neutron_server: 'docker.io/openstackhelm/neutron:newton' + neutron_sriov_agent: 'docker.io/openstackhelm/neutron:newton-sriov-1804' + neutron_sriov_agent_init: 'docker.io/openstackhelm/neutron:newton-sriov-1804' + nova_api: 'docker.io/openstackhelm/nova:newton' + nova_cell_setup: 'docker.io/openstackhelm/nova:newton' + nova_cell_setup_init: 'docker.io/openstackhelm/heat:newton' + nova_compute: 'docker.io/openstackhelm/nova:newton' + nova_compute_ironic: 'docker.io/openstackhelm/nova:newton' + nova_compute_ssh: 'docker.io/openstackhelm/nova:newton' + nova_conductor: 'docker.io/openstackhelm/nova:newton' + nova_consoleauth: 'docker.io/openstackhelm/nova:newton' + nova_db_sync: 'docker.io/openstackhelm/nova:newton' + nova_novncproxy: 'docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3' + nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3' + nova_placement: 'docker.io/openstackhelm/nova:newton' + nova_scheduler: 'docker.io/openstackhelm/nova:newton' + nova_spiceproxy: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3' + nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3' + scripted_test: 'docker.io/openstackhelm/heat:newton' + senlin_api: 'docker.io/openstackhelm/senlin:newton' + senlin_db_sync: 'docker.io/openstackhelm/senlin:newton' + senlin_engine: 'docker.io/openstackhelm/senlin:newton' + senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:newton' + tempest: 'docker.io/kolla/ubuntu-source-tempest:3.0.3' + test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'