diff --git a/.zuul.yaml b/.zuul.yaml index 0a6061a242..db39e96738 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -57,6 +57,11 @@ - ^.*\.rst$ - ^doc/.*$ - ^releasenotes/.*$ + - openstack-helm-kolla-deploy-ceph: + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^releasenotes/.*$ gate: jobs: - openstack-helm-linter: @@ -79,6 +84,11 @@ - ^.*\.rst$ - ^doc/.*$ - ^releasenotes/.*$ + - openstack-helm-kolla-deploy-ceph: + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^releasenotes/.*$ - job: name: openstack-helm-linter @@ -160,3 +170,8 @@ parent: openstack-helm-multinode nodeset: openstack-helm-ubuntu run: tools/gate/playbooks/ironic-deploy.yaml + +- job: + name: openstack-helm-kolla-deploy-ceph + parent: openstack-helm-dev-deploy + run: tools/gate/playbooks/kolla-deploy-ceph.yaml diff --git a/barbican/values.yaml b/barbican/values.yaml index ca3cfb6150..a2ff323fa0 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -21,22 +21,22 @@ release_group: null images: tags: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + bootstrap: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - scripted_test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - barbican_db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - barbican_api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 + 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 pull_policy: "IfNotPresent" pod: user: barbican: - uid: 1000 + uid: 42424 affinity: anti: type: diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 8da6b01d5b..4e9b883dc3 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -43,9 +43,9 @@ images: db_init_mongodb: docker.io/mongo:3.4.9-jessie db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 ceilometer_db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/openstackhelm/heat:newton + ks_service: docker.io/openstackhelm/heat:newton + ks_endpoints: docker.io/openstackhelm/heat:newton ceilometer_api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3 ceilometer_central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3 ceilometer_collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3 diff --git a/ceph/values.yaml b/ceph/values.yaml index 256e349170..0a08d6ca6e 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -22,9 +22,9 @@ deployment: images: tags: - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/openstackhelm/heat:newton + ks_service: docker.io/openstackhelm/heat:newton + ks_endpoints: docker.io/openstackhelm/heat:newton ceph_bootstrap: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 ceph_daemon: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 diff --git a/cinder/values.yaml b/cinder/values.yaml index 6d9a42cd7b..a9869835a3 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -31,19 +31,19 @@ release_group: null images: tags: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - cinder_db_sync: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - cinder_api: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - cinder_scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3 - cinder_volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3 - cinder_volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3 + db_init: docker.io/openstackhelm/heat:newton + cinder_db_sync: docker.io/openstackhelm/cinder: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 + 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 cinder_storage_init: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 - cinder_backup: docker.io/kolla/ubuntu-source-cinder-backup:3.0.3 + cinder_backup: docker.io/openstackhelm/cinder:newton cinder_backup_storage_init: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" diff --git a/congress/values.yaml b/congress/values.yaml index e0d17e646f..15e02a8c55 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -25,17 +25,17 @@ release_group: null images: tags: - congress_api: docker.io/kolla/ubuntu-source-congress-api:3.0.3 - congress_datasource: docker.io/kolla/ubuntu-source-congress-datasource:3.0.3 - congress_policy_engine: docker.io/kolla/ubuntu-source-congress-policy-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - congress_db_sync: docker.io/kolla/ubuntu-source-congress-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - congress_ds_create: docker.io/kolla/ubuntu-source-congress-api:3.0.3 - congress_scripted_test: docker.io/kolla/ubuntu-source-congress-api:3.0.3 + 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 + 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" @@ -305,7 +305,7 @@ conf: pod: user: congress: - uid: 1000 + uid: 42424 affinity: anti: type: diff --git a/doc/source/devref/images.rst b/doc/source/devref/images.rst index dc88a182eb..f9e8739901 100644 --- a/doc/source/devref/images.rst +++ b/doc/source/devref/images.rst @@ -57,17 +57,17 @@ chart: images: tags: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + 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/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine: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/kolla/ubuntu-source-heat-engine:3.0.3 + engine: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index 593e56ae27..d161011df2 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/glance/templates/job-bootstrap.yaml @@ -39,7 +39,7 @@ spec: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-bootstrap - image: {{ .Values.images.tags.bootstrap }} + image: {{ .Values.images.tags.glance_bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml index b2b9120b5c..5a002010a9 100644 --- a/glance/templates/job-clean.yaml +++ b/glance/templates/job-clean.yaml @@ -97,7 +97,7 @@ spec: readOnly: true {{ end }} - name: glance-image-clean - image: {{ .Values.images.tags.bootstrap }} + image: {{ .Values.images.tags.glance_bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/glance/values.yaml b/glance/values.yaml index ddb485d9ec..ab5a6b99bc 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -33,16 +33,16 @@ images: tags: test: docker.io/kolla/ubuntu-source-rally:4.0.0 glance_storage_init: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - glance_db_sync: docker.io/kolla/ubuntu-source-glance-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - glance_api: docker.io/kolla/ubuntu-source-glance-api:3.0.3 - glance_registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.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 + glance_api: docker.io/openstackhelm/glance:newton + glance_registry: docker.io/openstackhelm/glance:newton # Bootstrap image requires curl - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + glance_bootstrap: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" @@ -517,7 +517,7 @@ endpoints: pod: user: glance: - uid: 1000 + uid: 42424 affinity: anti: type: diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index c3abdc22a7..3612176cfc 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -18,9 +18,9 @@ images: # an indexer db_init: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/openstackhelm/heat:newton + ks_service: docker.io/openstackhelm/heat:newton + ks_endpoints: docker.io/openstackhelm/heat:newton gnocchi_api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 gnocchi_statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3 gnocchi_metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3 diff --git a/heat/values.yaml b/heat/values.yaml index 7d076e6a15..93a3afdbe7 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -28,17 +28,17 @@ labels: images: tags: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - heat_db_sync: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - heat_api: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - heat_cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - heat_cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - heat_engine: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + 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 + 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" @@ -493,7 +493,7 @@ endpoints: pod: user: heat: - uid: 1000 + uid: 42424 affinity: anti: type: diff --git a/horizon/values.yaml b/horizon/values.yaml index fd0e84245c..44723b3613 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -19,10 +19,10 @@ images: tags: - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - horizon_db_sync: docker.io/kolla/ubuntu-source-horizon:ocata - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - horizon: docker.io/kolla/ubuntu-source-horizon:ocata + 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" diff --git a/ironic/templates/bin/_ironic-conductor-pxe-init.sh.tpl b/ironic/templates/bin/_ironic-conductor-pxe-init.sh.tpl index 2ae06d8a7b..b8c4c4cd62 100644 --- a/ironic/templates/bin/_ironic-conductor-pxe-init.sh.tpl +++ b/ironic/templates/bin/_ironic-conductor-pxe-init.sh.tpl @@ -18,8 +18,11 @@ limitations under the License. set -ex -apt-get update -apt-get install ipxe -y +#NOTE(portdirect): this works round a limitation in Kolla images +if ! dpkg -l ipxe; then + apt-get update + apt-get install ipxe -y +fi mkdir -p /var/lib/openstack-helm/tftpboot mkdir -p /var/lib/openstack-helm/tftpboot/master_images diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml index 2f2d8c1e39..46a4cadc0d 100644 --- a/ironic/templates/deployment-api.yaml +++ b/ironic/templates/deployment-api.yaml @@ -48,7 +48,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_ironic_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ironic-retrive-cleaning-net - image: {{ .Values.images.tags.retrive_cleaning_network }} + image: {{ .Values.images.tags.ironic_retrive_cleaning_network }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ironic/templates/job-bootstrap.yaml b/ironic/templates/job-bootstrap.yaml index 1a670a3aef..c1846813de 100644 --- a/ironic/templates/job-bootstrap.yaml +++ b/ironic/templates/job-bootstrap.yaml @@ -42,7 +42,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ironic_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ironic-bootstrap - image: {{ .Values.images.tags.bootstrap }} + image: {{ .Values.images.tags.ironic_bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ironic/templates/job-manage-cleaning-network.yaml b/ironic/templates/job-manage-cleaning-network.yaml index 650a4cc92b..b741fc6c78 100644 --- a/ironic/templates/job-manage-cleaning-network.yaml +++ b/ironic/templates/job-manage-cleaning-network.yaml @@ -39,7 +39,7 @@ spec: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ironic-manage-cleaning-network - image: {{ .Values.images.tags.manage_cleaning_network }} + image: {{ .Values.images.tags.ironic_manage_cleaning_network }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.manage_cleaning_network | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml index 9b84438279..45e662be2b 100644 --- a/ironic/templates/statefulset-conductor.yaml +++ b/ironic/templates/statefulset-conductor.yaml @@ -98,7 +98,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: ironic-retrive-cleaning-net - image: {{ .Values.images.tags.retrive_cleaning_network }} + image: {{ .Values.images.tags.ironic_retrive_cleaning_network }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ironic/values.yaml b/ironic/values.yaml index 8ef5109906..960c14d850 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -23,18 +23,19 @@ labels: images: tags: - manage_cleaning_network: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - retrive_cleaning_network: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ironic_db_sync: docker.io/kolla/ubuntu-source-ironic-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ironic_api: docker.io/kolla/ubuntu-source-ironic-api:3.0.3 - ironic_conductor: docker.io/kolla/ubuntu-source-ironic-conductor:3.0.3 - ironic_pxe: docker.io/kolla/ubuntu-source-ironic-pxe:3.0.3 - ironic_pxe_init: docker.io/kolla/ubuntu-source-ironic-pxe:3.0.3 + ironic_manage_cleaning_network: docker.io/openstackhelm/heat:newton + ironic_retrive_cleaning_network: docker.io/openstackhelm/heat:newton + # Bootstrap image requires curl + ironic_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 + 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_pxe_http: docker.io/nginx:1.13.3 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" diff --git a/keystone/values.yaml b/keystone/values.yaml index 508c2425eb..107a16807e 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -25,17 +25,17 @@ release_group: null images: tags: - keystone_bootstrap: docker.io/kolla/ubuntu-source-keystone:3.0.3 + keystone_bootstrap: docker.io/openstackhelm/heat:newton test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - keystone_db_sync: docker.io/kolla/ubuntu-source-keystone:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - keystone_fernet_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3 - keystone_fernet_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3 - keystone_credential_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3 - keystone_credential_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3 - keystone_api: docker.io/kolla/ubuntu-source-keystone:3.0.3 + 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 + 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" diff --git a/magnum/values.yaml b/magnum/values.yaml index 4ab5b305e0..6b0eca6814 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -28,15 +28,15 @@ labels: images: tags: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - magnum_db_sync: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - magnum_api: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 - magnum_conductor: docker.io/kolla/ubuntu-source-magnum-conductor:3.0.3 + 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 + 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" @@ -285,7 +285,7 @@ endpoints: pod: user: magnum: - uid: 1000 + uid: 42424 affinity: anti: type: diff --git a/mariadb/values.yaml b/mariadb/values.yaml index b9dffdb5a5..64e8404616 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -17,7 +17,7 @@ images: mariadb: docker.io/mariadb:10.1.23 prometheus_create_mysql_user: docker.io/mariadb:10.1.23 prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0 - prometheus_mysql_exporter_helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: IfNotPresent diff --git a/mistral/values.yaml b/mistral/values.yaml index def3e1bd5e..2bcd7de10d 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -28,14 +28,14 @@ release_group: null images: tags: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + bootstrap: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/openstackhelm/heat:newton mistral_db_sync: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine: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 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 diff --git a/neutron/values.yaml b/neutron/values.yaml index c6dad342ae..6089c49bec 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -21,20 +21,20 @@ release_group: null images: tags: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + bootstrap: docker.io/openstackhelm/heat:newton test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - neutron_db_sync: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - neutron_server: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 - neutron_dhcp: docker.io/kolla/ubuntu-source-neutron-dhcp-agent:3.0.3 - neutron_metadata: docker.io/kolla/ubuntu-source-neutron-metadata-agent:3.0.3 - neutron_l3: docker.io/kolla/ubuntu-source-neutron-l3-agent:3.0.3 - neutron_openvswitch_agent: docker.io/kolla/ubuntu-source-neutron-openvswitch-agent:3.0.3 - neutron_linuxbridge_agent: docker.io/kolla/ubuntu-source-neutron-linuxbridge-agent:3.0.3 + db_init: docker.io/openstackhelm/heat:newton + neutron_db_sync: docker.io/openstackhelm/neutron: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 + 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" @@ -216,7 +216,7 @@ dependencies: pod: user: neutron: - uid: 1000 + uid: 42424 affinity: anti: type: @@ -930,7 +930,7 @@ conf: database: max_retries: -1 agent: - root_helper: sudo /var/lib/kolla/venv/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + root_helper: sudo /var/lib/openstack/bin/neutron-rootwrap /etc/neutron/rootwrap.conf oslo_messaging_notifications: driver: messagingv2 nova: diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index 5668d9e182..7ec25a2f5b 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -39,7 +39,7 @@ spec: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-db-sync - image: {{ .Values.images.tags.db_sync }} + image: {{ .Values.images.tags.nova_db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/nova/values.yaml b/nova/values.yaml index 8c04b3fc93..420c2d49c2 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -58,26 +58,26 @@ labels: images: pull_policy: IfNotPresent tags: - bootstrap: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3' - db_drop: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3' - db_init: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3' - db_sync: 'docker.io/kolla/ubuntu-source-nova-api:3.0.3' + bootstrap: docker.io/openstackhelm/heat:newton + db_drop: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:newton dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.2.1' - ks_endpoints: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3' - ks_service: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3' - ks_user: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3' - nova_api: 'docker.io/kolla/ubuntu-source-nova-api:3.0.3' - nova_cell_setup: 'docker.io/kolla/ubuntu-source-nova-api:3.0.3' - nova_compute: 'docker.io/kolla/ubuntu-source-nova-compute:3.0.3' + 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_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/kolla/ubuntu-source-nova-ssh:3.0.3' - nova_conductor: 'docker.io/kolla/ubuntu-source-nova-conductor:3.0.3' - nova_consoleauth: 'docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3' - nova_novncproxy: 'docker.io/kolla/ubuntu-source-nova-novncproxy: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/kolla/ubuntu-source-nova-placement-api:3.0.3-beta.1' - nova_scheduler: 'docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3' - nova_spiceproxy: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3' + nova_placement: docker.io/openstackhelm/nova:newton + nova_scheduler: docker.io/openstackhelm/nova:newton + nova_spiceproxy: docker.io/openstackhelm/nova:newton nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3' test: 'docker.io/kolla/ubuntu-source-rally:4.0.0' @@ -1085,7 +1085,7 @@ endpoints: default: mariadb host_fqdn_override: default: null - path: /nova_api_cell0 + path: /nova_cell0 scheme: mysql+pymysql port: mysql: @@ -1302,7 +1302,7 @@ endpoints: pod: user: nova: - uid: 1000 + uid: 42424 affinity: anti: type: diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index 78ddd61efe..48d8ba05f0 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -28,7 +28,7 @@ labels: images: tags: prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0 - prometheus_rabbitmq_exporter_helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:newton rabbitmq: docker.io/rabbitmq:3.7 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" diff --git a/rally/values.yaml b/rally/values.yaml index 2fcb67326e..d03688bbae 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -26,9 +26,9 @@ images: db_init: docker.io/kolla/ubuntu-source-rally:3.0.3 manage_db: docker.io/kolla/ubuntu-source-rally:3.0.3 run_task: docker.io/kolla/ubuntu-source-rally:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + 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-rally:3.0.3 pull_policy: "IfNotPresent" diff --git a/senlin/values.yaml b/senlin/values.yaml index d793fd6385..a9f0098bff 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -28,15 +28,15 @@ release_group: null images: tags: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - senlin_db_sync: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - senlin_api: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 - senlin_engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3 + 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 + 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" @@ -297,7 +297,7 @@ endpoints: pod: user: senlin: - uid: 1000 + uid: 42424 affinity: anti: type: diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh index a96d99af39..c06e8ee72b 100755 --- a/tools/deployment/baremetal/005-setup-nodes.sh +++ b/tools/deployment/baremetal/005-setup-nodes.sh @@ -57,7 +57,7 @@ for LIBVIRT_POD in ${LIBVIRT_PODS}; do kubectl exec -n libvirt ${LIBVIRT_POD} -- sh -c "virsh undefine fake-baremetal-1 || true" kubectl exec -n libvirt ${LIBVIRT_POD} -- virsh define /tmp/fake-baremetal-1.xml kubectl exec -n libvirt ${LIBVIRT_POD} -- sh -c "vbmc delete fake-baremetal-1 || true" - kubectl exec -n libvirt ${LIBVIRT_POD} -- vbmc add fake-baremetal-1 + kubectl exec -n libvirt ${LIBVIRT_POD} -- vbmc add fake-baremetal-1 --address ${LIBVIRT_NODE_IP} kubectl exec -n libvirt ${LIBVIRT_POD} -- sh -c "nohup vbmc start fake-baremetal-1 &>/dev/null &" kubectl exec -n libvirt ${LIBVIRT_POD} -- virsh list --all kubectl exec -n libvirt ${LIBVIRT_POD} -- vbmc show fake-baremetal-1 diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh index 984a536b88..9a3e6c8465 100755 --- a/tools/deployment/common/memcached.sh +++ b/tools/deployment/common/memcached.sh @@ -20,8 +20,10 @@ set -xe make pull-images memcached #NOTE: Deploy command +: ${EXTRA_CONFIG:=""} helm upgrade --install memcached ./memcached \ - --namespace=openstack + --namespace=openstack \ + ${EXTRA_CONFIG} #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh index 16b85ea984..bd138892c5 100755 --- a/tools/deployment/developer/ceph/040-ceph.sh +++ b/tools/deployment/developer/ceph/040-ceph.sh @@ -20,6 +20,7 @@ set -xe make pull-images ceph #NOTE: Deploy command +: ${EXTRA_CONFIG:=""} uuidgen > /tmp/ceph-fs-uuid.txt CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" #NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this @@ -155,7 +156,8 @@ conf: EOF helm upgrade --install ceph ./ceph \ --namespace=ceph \ - --values=/tmp/ceph.yaml + --values=/tmp/ceph.yaml \ + ${EXTRA_CONFIG} #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh ceph diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh index ca0094296f..982112b60e 100755 --- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh +++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh @@ -20,6 +20,7 @@ set -xe make pull-images ceph #NOTE: Deploy command +: ${EXTRA_CONFIG:=""} CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" tee /tmp/ceph-openstack-config.yaml <