diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/glance.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/glance.yaml index 41e7da1b..98121d90 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/glance.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/glance.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.glance dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.glance + dest: + path: .values.images.tags data: chart_name: glance release: glance diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml index 97f1b58c..9f2a01f9 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.heat dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.heat + dest: + path: .values.images.tags data: chart_name: heat release: heat diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/horizon.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/horizon.yaml index bcdf854f..09325942 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/horizon.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/horizon.yaml @@ -17,6 +17,13 @@ metadata: path: .charts.openstack.horizon dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.horizon + dest: + path: .values.images.tags data: chart_name: horizon release: horizon diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/keystone.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/keystone.yaml index 07bb5905..1c11d7f9 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/keystone.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/keystone.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.keystone dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.keystone + dest: + path: .values.images.tags data: chart_name: keystone release: openstack-keystone diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/mariadb.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/mariadb.yaml index 7fbc8936..16247563 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/mariadb.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/mariadb.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.mariadb dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.mariadb + dest: + path: .values.images.tags data: chart_name: mariadb release: openstack-mariadb diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/memcached.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/memcached.yaml index 1257c28c..0fef4f46 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/memcached.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/memcached.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.memcached dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.memcached + dest: + path: .values.images.tags data: chart_name: memcached release: openstack-memcached diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/rabbitmq.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/rabbitmq.yaml index d1b89796..b4b5de21 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/rabbitmq.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/rabbitmq.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.rabbitmq dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.rabbitmq + dest: + path: .values.images.tags data: chart_name: rabbitmq release: rabbitmq diff --git a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/libvirt.yaml b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/libvirt.yaml index afaa0aa4..b77eddc7 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/libvirt.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/libvirt.yaml @@ -15,14 +15,17 @@ metadata: path: .charts.openstack.libvirt dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.libvirt + dest: + path: .values.images.tags data: chart_name: libvirt release: openstack-libvirt namespace: openstack - wait: - timeout: 1800 - labels: - release_group: airship-openstack-libvirt install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml index 6c04d272..40dc0edb 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.neutron dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.neutron + dest: + path: .values.images.tags data: chart_name: neutron release: neutron diff --git a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml index eb967374..19fcc193 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.nova dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.nova + dest: + path: .values.images.tags data: chart_name: nova release: nova diff --git a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/openvswitch.yaml b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/openvswitch.yaml index 2c5162c7..8034ff2f 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/openvswitch.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/openvswitch.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.openvswitch dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.openvswitch + dest: + path: .values.images.tags data: chart_name: openvswitch release: openvswitch diff --git a/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml b/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml index 264e5dc8..962b330d 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml @@ -15,6 +15,13 @@ metadata: path: .charts.openstack.ingress dest: path: .source + # Images + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .images.osh.ingress + dest: + path: .values.images.tags data: chart_name: openstack-ingress-controller release: openstack-ingress-controller diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml index cf2db222..9917667e 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml @@ -71,6 +71,10 @@ data: - type: job labels: release_group: airship-ucp-rabbitmq + - type: pod + labels: + release_group: airship-ucp-rabbitmq + component: test values: pod: replicas: diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml index 79eb5c1b..39ac788b 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml @@ -123,6 +123,10 @@ data: - type: job labels: release_group: airship-ucp-keystone + - type: pod + labels: + release_group: airship-ucp-keystone + component: test post: create: [] values: diff --git a/deployment_files/site/demo/software/configs/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml similarity index 97% rename from deployment_files/site/demo/software/configs/endpoints.yaml rename to deployment_files/global/v1.0demo/software/config/endpoints.yaml index 5a8558af..5cf471b5 100644 --- a/deployment_files/site/demo/software/configs/endpoints.yaml +++ b/deployment_files/global/v1.0demo/software/config/endpoints.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_endpoints layeringDefinition: abstract: false - layer: site + layer: global storagePolicy: cleartext data: ucp: @@ -13,8 +13,8 @@ data: namespace: ucp name: keystone hosts: - default: keystone-api - public: keystone + default: keystone + internal: keystone-api host_fqdn_override: default: null path: @@ -22,10 +22,9 @@ data: scheme: default: http port: - admin: - default: 35357 api: default: 80 + internal: 5000 armada: name: armada hosts: @@ -99,7 +98,7 @@ data: default: rabbitmq host_fqdn_override: default: null - path: /openstack + path: /keystone scheme: rabbit port: amqp: diff --git a/deployment_files/site/dev/software/configs/service_accounts.yaml b/deployment_files/global/v1.0demo/software/config/service_accounts.yaml similarity index 99% rename from deployment_files/site/dev/software/configs/service_accounts.yaml rename to deployment_files/global/v1.0demo/software/config/service_accounts.yaml index 50e1abc4..87a8c75f 100644 --- a/deployment_files/site/dev/software/configs/service_accounts.yaml +++ b/deployment_files/global/v1.0demo/software/config/service_accounts.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_service_accounts layeringDefinition: abstract: false - layer: site + layer: global storagePolicy: cleartext data: ucp: diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index 004f96e9..e8a4aefb 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -11,150 +11,146 @@ metadata: storagePolicy: cleartext data: charts: - dependencies: - ucp-helm-toolkit: - type: git - location: https://git.openstack.org/openstack/openstack-helm - subpath: helm-toolkit - reference: master kubernetes: calico: etcd: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/etcd - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 etcd-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 calico: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: calico - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 calico-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 apiserver: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/apiserver - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 apiserver-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 controller-manager: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/controller_manager - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 controller-manager-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 coredns: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/coredns - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 coredns-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 haproxy: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/haproxy - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 haproxy-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 etcd: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/etcd - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 etcd-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: ingress - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 proxy: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/proxy - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 proxy-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 scheduler: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/scheduler - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 scheduler-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ucp: nfs_provisioner: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: nfs-provisioner - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 nfs_htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 armada: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/armada - reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 + reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290 armada-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 35ac52023a75e44ff4ef1874857952a5b3dbf561 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 barbican: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: barbican - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 barbican-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 + #TODO Update to split ceph charts ceph: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: ceph reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + #TODO Update to new HTK with split ceph charts ceph-htk: type: git location: https://git.openstack.org/openstack/openstack-helm @@ -164,27 +160,29 @@ data: type: git location: https://git.openstack.org/openstack/airship-deckhand subpath: charts/deckhand - reference: 59182380e3272fd28f9c21b2e7cdc784f7a36f74 + reference: a0f00013b5db1def374fbd5b9f0009f704290bb1 deckhand-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 divingbell: type: git location: https://git.openstack.org/openstack/airship-divingbell subpath: divingbell - reference: 9e7028416e8b6798c1b2bf04770bd165e398b5c1 + reference: 0ac90c40a0741a929204d139dfa0415562b7044e divingbell-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 drydock: type: git location: https://git.openstack.org/openstack/airship-drydock subpath: charts/drydock - reference: 7e7739ce2cbe3156a8ecec854639052542d40dcf + reference: f8c821e7219f84f12e3a90e3101c6f20d3049b5b + # TODO waiting for https://review.openstack.org/#/c/595902/ to move to + # openstack-helm-infra version. drydock-htk: type: git location: https://git.openstack.org/openstack/openstack-helm @@ -192,249 +190,283 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: ingress - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 postgresql: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: postgresql - reference: 8dc986740c83487261efa6540f89d5dbea211f98 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 postgresql-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 promenade: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/promenade - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 promenade-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 keystone: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: keystone - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 keystone-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 maas: type: git location: https://git.openstack.org/openstack/airship-maas subpath: charts/maas - reference: 7af3ee934732bf1aec6b452f34727ef563a7f179 + # TODO(bryan-strassner) set to new version + # when https://review.openstack.org/#/c/595398/ is complete + reference: refs/changes/98/595398/5 maas-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 mariadb: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: mariadb - reference: 8dc986740c83487261efa6540f89d5dbea211f98 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 mariadb-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 memcached: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: memcached - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 memcached-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 rabbitmq: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: rabbitmq - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 rabbitmq-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 shipyard: type: git location: https://git.openstack.org/openstack/airship-shipyard subpath: charts/shipyard - reference: 66da23cb20c545bf82e7d1aec321edf9ebc06cac + reference: 188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b shipyard-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 tiller: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/tiller - reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 + reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290 tiller-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 35ac52023a75e44ff4ef1874857952a5b3dbf561 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 openstack: glance: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: glance - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 glance-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 heat: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: heat - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 heat-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 horizon: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: horizon - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 horizon-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: ingress - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 keystone: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: keystone - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 keystone-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 libvirt: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: libvirt - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 libvirt-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 mariadb: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: mariadb - reference: 8dc986740c83487261efa6540f89d5dbea211f98 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 mariadb-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 memcached: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: memcached - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 memcached-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 neutron: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: neutron - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 neutron-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 nova: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: nova - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 nova-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 openvswitch: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: openvswitch - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 openvswitch-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 rabbitmq: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: rabbitmq - reference: a4fa9b761e2de14df588c1e37f3693174f15ad36 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 rabbitmq-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 files: kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz + + images_refs: + images: + dep_check: &dep_check quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + heat: &heat docker.io/openstackhelm/heat:ocata + neutron: &neutron docker.io/openstackhelm/neutron:ocata + horizon: &horizon docker.io/openstackhelm/horizon:ocata + cinder: &cinder docker.io/openstackhelm/cinder:ocata + keystone: &keystone docker.io/openstackhelm/keystone:ocata + nova: &nova docker.io/openstackhelm/nova:ocata + glance: &glance docker.io/openstackhelm/glance:ocata + rabbitmq: &rabbitmq docker.io/rabbitmq:3.7-management + rally_test: &rally_test docker.io/kolla/ubuntu-source-rally:4.0.0 + memcached: &memcached docker.io/memcached:1.5.5 + mariadb_db: &mariadb_db docker.io/mariadb:10.2.13 + nova_novncproxy: &nova_novncproxy docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3 + nova_spiceproxy: &nova_spiceproxy docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3 + ceph_daemon: &ceph_daemon docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 + openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:v2.8.1 + os_barbican: &os_barbican docker.io/openstackhelm/barbican:ocata + libvirt: &libvirt docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1 + ingress_controller: &ingress_controller quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 + ingress_error_pages: &ingress_error_pages gcr.io/google-containers/defaultbackend:1.0 + # should probably be moved to https://quay.io/repository/airshipit/ + storage_init: &storage_init docker.io/port/ceph-config-helper:v1.10.2 + keystone: &ref_keystone + ks_endpoints: *heat + ks_service: *heat + ks_user: *heat + images: ucp: armada: - api: quay.io/airshipit/armada:b6479f660714a6d14c6aa291dc36b8451f1c9219 + api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_user: docker.io/openstackhelm/heat:ocata - helm: lachlanevenson/k8s-helm:v2.7.2 - tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 + helm: lachlanevenson/k8s-helm:v2.10.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 promenade: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - promenade: quay.io/airshipit/promenade:146c67c6b15d8eccf942d2c048f96c3305948864 + promenade: quay.io/airshipit/promenade:88c786b8e92d053fd0cba7237df68cc087b81f26 ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata deckhand: - deckhand: quay.io/airshipit/deckhand:59182380e3272fd28f9c21b2e7cdc784f7a36f74 + # pinned back to older version to prevent substitution errors with + # newer version e.g.: fc03c6318a36fa60faf56ee79d91573fe7c60feb + deckhand: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 db_init: docker.io/postgres:9.5 - db_sync: quay.io/airshipit/deckhand:59182380e3272fd28f9c21b2e7cdc784f7a36f74 + db_sync: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_user: docker.io/openstackhelm/heat:ocata @@ -450,32 +482,31 @@ data: ks_user: docker.io/openstackhelm/heat:ocata barbican_api: docker.io/openstackhelm/barbican:ocata drydock: - drydock: quay.io/airshipit/drydock:7e7739ce2cbe3156a8ecec854639052542d40dcf + drydock: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata drydock_db_init: docker.io/postgres:9.5 - drydock_db_sync: quay.io/airshipit/drydock:7e7739ce2cbe3156a8ecec854639052542d40dcf + drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 shipyard: - airflow: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac - shipyard: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac + airflow: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b + shipyard: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 shipyard_db_init: docker.io/postgres:9.5 - shipyard_db_sync: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac + shipyard_db_sync: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b airflow_db_init: docker.io/postgres:9.5 - airflow_db_sync: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac + airflow_db_sync: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 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 maas: db_init: docker.io/postgres:9.5 - db_sync: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - maas_rack: quay.io/airshipit/maas-rack-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - maas_region: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - bootstrap: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - export_api_key: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 + db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 maas_cache: quay.io/attcomdev/sstream-cache@sha256:sha256:90d0dc73785534ef6a3035265275e197a66727beeb9c979f60d3bbf31a6a8864 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 keystone: @@ -491,7 +522,7 @@ data: keystone_api: docker.io/openstackhelm/keystone:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 tiller: - tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 mariadb: mariadb: docker.io/mariadb:10.1.23 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 @@ -504,6 +535,7 @@ data: rabbitmq: rabbitmq: docker.io/rabbitmq:3.7 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + #TODO Update to split ceph charts ceph: ceph: ks_endpoints: docker.io/openstackhelm/heat:ocata @@ -554,6 +586,130 @@ data: kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0 node: quay.io/calico/node:v2.6.5 settings: quay.io/calico/ctl:v1.6.2 + osh: + memcached: + dep_check: *dep_check + memcached: *memcached + barbican: + bootstrap: *heat + dep_check: *dep_check + scripted_test: *heat + db_init: *heat + barbican_db_sync: *os_barbican + db_drop: *heat + <<: *ref_keystone + barbican_api: *os_barbican + rabbit_init: *rabbitmq + glance: + test: *rally_test + glance_storage_init: *storage_init + db_init: *heat + glance_db_sync: *glance + db_drop: *heat + <<: *ref_keystone + glance_api: *glance + glance_registry: *glance + # Bootstrap image requires curl + bootstrap: *heat + dep_check: *dep_check + rabbit_init: *rabbitmq + heat: + bootstrap: *heat + db_init: *heat + heat_db_sync: *heat + db_drop: *heat + <<: *ref_keystone + heat_api: *heat + heat_cfn: *heat + heat_cloudwatch: *heat + heat_engine: *heat + heat_engine_cleaner: *heat + dep_check: *dep_check + rabbit_init: *rabbitmq + horizon: + db_init: *heat + horizon_db_sync: *horizon + db_drop: *heat + horizon: *horizon + dep_check: *dep_check + ingress: + entrypoint: *dep_check + ingress: *ingress_controller + error_pages: *ingress_error_pages + dep_check: *dep_check + keystone: + bootstrap: *heat + test: *rally_test + db_init: *heat + keystone_db_sync: *keystone + db_drop: *heat + <<: *ref_keystone + keystone_fernet_setup: *keystone + keystone_fernet_rotate: *keystone + keystone_credential_setup: *keystone + keystone_credential_rotate: *keystone + keystone_api: *keystone + keystone_domain_manage: *keystone + dep_check: *dep_check + rabbit_init: *rabbitmq + libvirt: + libvirt: *libvirt + dep_check: *dep_check + mariadb: + mariadb: *mariadb_db + ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 + error_pages: gcr.io/google-containers/defaultbackend:1.0 + prometheus_create_mysql_user: *mariadb_db + prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0 + prometheus_mysql_exporter_helm_tests: *heat + dep_check: *dep_check + image_repo_sync: docker.io/docker:17.07.0 + neutron: + bootstrap: *heat + test: *rally_test + db_init: *heat + neutron_db_sync: *neutron + db_drop: *heat + <<: *ref_keystone + neutron_server: *neutron + neutron_dhcp: *neutron + neutron_metadata: *neutron + neutron_l3: *neutron + neutron_openvswitch_agent: *neutron + neutron_linuxbridge_agent: *neutron + dep_check: *dep_check + rabbit_init: *rabbitmq + nova: + bootstrap: *heat + db_drop: *heat + db_init: *heat + dep_check: *dep_check + <<: *ref_keystone + nova_api: *nova + nova_cell_setup: *nova + nova_cell_setup_init: *heat + nova_compute: *nova + nova_compute_ssh: *nova + nova_conductor: *nova + nova_consoleauth: *nova + nova_db_sync: *nova + nova_novncproxy: *nova + nova_novncproxy_assets: *nova_novncproxy + nova_placement: *nova + nova_scheduler: *nova + nova_spiceproxy: *nova + nova_spiceproxy_assets: *nova_spiceproxy + test: *rally_test + rabbit_init: *rabbitmq + openvswitch: + openvswitch_db_server: *openvswitch + openvswitch_vswitchd: *openvswitch + dep_check: *dep_check + rabbitmq: + prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0 + prometheus_rabbitmq_exporter_helm_tests: *heat + rabbitmq: docker.io/rabbitmq:3.7.4 + dep_check: *dep_check packages: named: docker: docker.io diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml index cf2db222..9917667e 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml @@ -71,6 +71,10 @@ data: - type: job labels: release_group: airship-ucp-rabbitmq + - type: pod + labels: + release_group: airship-ucp-rabbitmq + component: test values: pod: replicas: diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml index 79eb5c1b..39ac788b 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml @@ -123,6 +123,10 @@ data: - type: job labels: release_group: airship-ucp-keystone + - type: pod + labels: + release_group: airship-ucp-keystone + component: test post: create: [] values: diff --git a/deployment_files/site/dev/software/configs/endpoints.yaml b/deployment_files/global/v1.0dev/software/config/endpoints.yaml similarity index 97% rename from deployment_files/site/dev/software/configs/endpoints.yaml rename to deployment_files/global/v1.0dev/software/config/endpoints.yaml index 5a8558af..5cf471b5 100644 --- a/deployment_files/site/dev/software/configs/endpoints.yaml +++ b/deployment_files/global/v1.0dev/software/config/endpoints.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_endpoints layeringDefinition: abstract: false - layer: site + layer: global storagePolicy: cleartext data: ucp: @@ -13,8 +13,8 @@ data: namespace: ucp name: keystone hosts: - default: keystone-api - public: keystone + default: keystone + internal: keystone-api host_fqdn_override: default: null path: @@ -22,10 +22,9 @@ data: scheme: default: http port: - admin: - default: 35357 api: default: 80 + internal: 5000 armada: name: armada hosts: @@ -99,7 +98,7 @@ data: default: rabbitmq host_fqdn_override: default: null - path: /openstack + path: /keystone scheme: rabbit port: amqp: diff --git a/deployment_files/site/demo/software/configs/service_accounts.yaml b/deployment_files/global/v1.0dev/software/config/service_accounts.yaml similarity index 99% rename from deployment_files/site/demo/software/configs/service_accounts.yaml rename to deployment_files/global/v1.0dev/software/config/service_accounts.yaml index 50e1abc4..87a8c75f 100644 --- a/deployment_files/site/demo/software/configs/service_accounts.yaml +++ b/deployment_files/global/v1.0dev/software/config/service_accounts.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_service_accounts layeringDefinition: abstract: false - layer: site + layer: global storagePolicy: cleartext data: ucp: diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml index 9bee7bf9..45595313 100644 --- a/deployment_files/global/v1.0dev/software/config/versions.yaml +++ b/deployment_files/global/v1.0dev/software/config/versions.yaml @@ -11,152 +11,146 @@ metadata: storagePolicy: cleartext data: charts: - dependencies: - ucp-helm-toolkit: - type: git - location: https://git.openstack.org/openstack/openstack-helm - subpath: helm-toolkit - reference: master kubernetes: calico: etcd: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/etcd - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 etcd-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 calico: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: calico - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 calico-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 apiserver: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/apiserver - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 apiserver-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 controller-manager: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/controller_manager - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 controller-manager-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 coredns: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/coredns - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 coredns-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 haproxy: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/haproxy - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 haproxy-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 etcd: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/etcd - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 etcd-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: ingress - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 proxy: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/proxy - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 proxy-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 scheduler: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/scheduler - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 scheduler-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ucp: nfs_provisioner: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: nfs-provisioner - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 nfs_htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 armada: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/armada - reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 + reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290 armada-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 35ac52023a75e44ff4ef1874857952a5b3dbf561 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 barbican: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: barbican - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 barbican-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 - # TODO Update to openstack-helm and split to match split projects + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 + #TODO Update to split ceph charts ceph: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: ceph reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 - # TODO Update to openstack-helm-infra + #TODO Update to new HTK with split ceph charts ceph-htk: type: git location: https://git.openstack.org/openstack/openstack-helm @@ -166,27 +160,29 @@ data: type: git location: https://git.openstack.org/openstack/airship-deckhand subpath: charts/deckhand - reference: 59182380e3272fd28f9c21b2e7cdc784f7a36f74 + reference: a0f00013b5db1def374fbd5b9f0009f704290bb1 deckhand-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 divingbell: type: git location: https://git.openstack.org/openstack/airship-divingbell subpath: divingbell - reference: 9e7028416e8b6798c1b2bf04770bd165e398b5c1 + reference: 0ac90c40a0741a929204d139dfa0415562b7044e divingbell-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 drydock: type: git location: https://git.openstack.org/openstack/airship-drydock subpath: charts/drydock - reference: 7e7739ce2cbe3156a8ecec854639052542d40dcf + reference: f8c821e7219f84f12e3a90e3101c6f20d3049b5b + # TODO waiting for https://review.openstack.org/#/c/595902/ to move to + # openstack-helm-infra version. drydock-htk: type: git location: https://git.openstack.org/openstack/openstack-helm @@ -194,127 +190,132 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: ingress - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 ingress-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 postgresql: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: postgresql - reference: 8dc986740c83487261efa6540f89d5dbea211f98 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 postgresql-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 promenade: type: git location: https://git.openstack.org/openstack/airship-promenade subpath: charts/promenade - reference: 146c67c6b15d8eccf942d2c048f96c3305948864 + reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 promenade-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 keystone: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: keystone - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 keystone-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 maas: type: git location: https://git.openstack.org/openstack/airship-maas subpath: charts/maas - reference: 7af3ee934732bf1aec6b452f34727ef563a7f179 + # TODO(bryan-strassner) set to new version + # when https://review.openstack.org/#/c/595398/ is complete + reference: refs/changes/98/595398/5 maas-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 mariadb: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: mariadb - reference: 8dc986740c83487261efa6540f89d5dbea211f98 + reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 mariadb-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 9f921f23fb2df702981a0b3d33062ff607350f75 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 memcached: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: memcached - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 memcached-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 rabbitmq: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: rabbitmq - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 rabbitmq-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 shipyard: type: git location: https://git.openstack.org/openstack/airship-shipyard subpath: charts/shipyard - reference: 66da23cb20c545bf82e7d1aec321edf9ebc06cac + reference: 188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b shipyard-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 92f024ba562f2f8b06286dc6263e0ea9dc2c1477 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 tiller: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/tiller - reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 + reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290 tiller-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: 35ac52023a75e44ff4ef1874857952a5b3dbf561 + reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 + files: kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz images: ucp: armada: - api: quay.io/airshipit/armada:b6479f660714a6d14c6aa291dc36b8451f1c9219 + api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_user: docker.io/openstackhelm/heat:ocata - helm: lachlanevenson/k8s-helm:v2.7.2 - tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 + helm: lachlanevenson/k8s-helm:v2.10.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 promenade: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - promenade: quay.io/airshipit/promenade:146c67c6b15d8eccf942d2c048f96c3305948864 + promenade: quay.io/airshipit/promenade:88c786b8e92d053fd0cba7237df68cc087b81f26 ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata deckhand: - deckhand: quay.io/airshipit/deckhand:59182380e3272fd28f9c21b2e7cdc784f7a36f74 + # pinned back to older version to prevent substitution errors with + # newer version e.g.: fc03c6318a36fa60faf56ee79d91573fe7c60feb + deckhand: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 db_init: docker.io/postgres:9.5 - db_sync: quay.io/airshipit/deckhand:59182380e3272fd28f9c21b2e7cdc784f7a36f74 + db_sync: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_user: docker.io/openstackhelm/heat:ocata @@ -330,32 +331,31 @@ data: ks_user: docker.io/openstackhelm/heat:ocata barbican_api: docker.io/openstackhelm/barbican:ocata drydock: - drydock: quay.io/airshipit/drydock:7e7739ce2cbe3156a8ecec854639052542d40dcf + drydock: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata drydock_db_init: docker.io/postgres:9.5 - drydock_db_sync: quay.io/airshipit/drydock:7e7739ce2cbe3156a8ecec854639052542d40dcf + drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 shipyard: - airflow: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac - shipyard: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac + airflow: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b + shipyard: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 shipyard_db_init: docker.io/postgres:9.5 - shipyard_db_sync: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac + shipyard_db_sync: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b airflow_db_init: docker.io/postgres:9.5 - airflow_db_sync: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac + airflow_db_sync: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 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 maas: db_init: docker.io/postgres:9.5 - db_sync: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - maas_rack: quay.io/airshipit/maas-rack-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - maas_region: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - bootstrap: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 - export_api_key: quay.io/airshipit/maas-region-controller:7af3ee934732bf1aec6b452f34727ef563a7f179 + db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 maas_cache: quay.io/attcomdev/sstream-cache@sha256:sha256:90d0dc73785534ef6a3035265275e197a66727beeb9c979f60d3bbf31a6a8864 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 keystone: @@ -371,7 +371,7 @@ data: keystone_api: docker.io/openstackhelm/keystone:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 tiller: - tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 mariadb: mariadb: docker.io/mariadb:10.1.23 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 @@ -384,6 +384,7 @@ data: rabbitmq: rabbitmq: docker.io/rabbitmq:3.7 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + #TODO Update to split ceph charts ceph: ceph: ks_endpoints: docker.io/openstackhelm/heat:ocata diff --git a/deployment_files/site/dev-proxy/software/configs/endpoints.yaml b/deployment_files/site/dev-proxy/software/configs/endpoints.yaml deleted file mode 100644 index 5a8558af..00000000 --- a/deployment_files/site/dev-proxy/software/configs/endpoints.yaml +++ /dev/null @@ -1,235 +0,0 @@ ---- -schema: pegleg/EndpointCatalogue/v1 -metadata: - schema: metadata/Document/v1 - name: ucp_endpoints - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - ucp: - identity: - namespace: ucp - name: keystone - hosts: - default: keystone-api - public: keystone - host_fqdn_override: - default: null - path: - default: /v3 - scheme: - default: http - port: - admin: - default: 35357 - api: - default: 80 - armada: - name: armada - hosts: - default: armada-api - public: armada - port: - api: - default: 8000 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - deckhand: - name: deckhand - hosts: - default: deckhand-int - public: deckhand-api - port: - api: - default: 9000 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - postgresql: - name: postgresql - hosts: - default: postgresql - path: /DB_NAME - scheme: postgresql+psycopg2 - port: - postgresql: - default: 5432 - host_fqdn_override: - default: null - oslo_db: - hosts: - default: mariadb - discovery: mariadb-discovery - host_fqdn_override: - default: null - path: /DB_NAME - scheme: mysql+pymysql - port: - mysql: - default: 3306 - wsrep: - default: 4567 - key_manager: - name: barbican - hosts: - default: barbican-api - public: barbican - host_fqdn_override: - default: null - path: - default: /v1 - scheme: - default: http - port: - api: - default: 9311 - public: 80 - oslo_messaging: - namespace: null - hosts: - default: rabbitmq - host_fqdn_override: - default: null - path: /openstack - scheme: rabbit - port: - amqp: - default: 5672 - oslo_cache: - hosts: - default: memcached - host_fqdn_override: - default: null - port: - memcache: - default: 11211 - physicalprovisioner: - name: drydock - hosts: - default: drydock-api - port: - api: - default: 9000 - nodeport: 31900 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - maas_region_ui: - name: maas-region-ui - hosts: - default: maas-region-ui - public: maas - path: - default: /MAAS - scheme: - default: "http" - port: - region_ui: - default: 80 - public: 80 - host_fqdn_override: - default: null - kubernetesprovisioner: - name: promenade - hosts: - default: promenade-api - port: - api: - default: 80 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - shipyard: - name: shipyard - hosts: - default: shipyard-int - public: shipyard-api - port: - api: - default: 9000 - public: 80 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - airflow_web: - name: airflow-web - hosts: - default: airflow-web-int - public: airflow-web - port: - airflow_web: - default: 8080 - path: - default: / - scheme: - default: http - host_fqdn_override: - default: null - airflow_flower: - name: airflow-flower - hosts: - default: airflow-flower - port: - airflow_flower: - default: 5555 - path: - default: / - scheme: - default: http - host_fqdn_override: - default: null - ceph: - object_store: - name: swift - namespace: ceph - hosts: - default: ceph-rgw - host_fqdn_override: - default: null - path: - default: /swift/v1 - scheme: - default: http - port: - api: - default: 8088 - ceph_mon: - namespace: ceph - hosts: - default: ceph-mon - discovery: ceph-mon-discovery - host_fqdn_override: - default: null - port: - mon: - default: 6789 - ceph_mgr: - namespace: ceph - hosts: - default: ceph-mgr - host_fqdn_override: - default: null - port: - mgr: - default: 7000 - scheme: - default: http -... diff --git a/deployment_files/site/dev-proxy/software/configs/service_accounts.yaml b/deployment_files/site/dev-proxy/software/configs/service_accounts.yaml deleted file mode 100644 index 50e1abc4..00000000 --- a/deployment_files/site/dev-proxy/software/configs/service_accounts.yaml +++ /dev/null @@ -1,124 +0,0 @@ ---- -schema: pegleg/AccountCatalogue/v1 -metadata: - schema: metadata/Document/v1 - name: ucp_service_accounts - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - ucp: - postgres: - admin: - username: postgres - oslo_db: - admin: - username: root - oslo_messaging: - admin: - username: rabbitmq - keystone: - admin: - region_name: RegionOne - username: admin - project_name: admin - user_domain_name: default - project_domain_name: default - oslo_messaging: - admin: - username: rabbitmq - keystone: - username: keystone - oslo_db: - username: keystone - database: keystone - promenade: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: promenade - drydock: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: drydock - postgres: - username: drydock - database: drydock - shipyard: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: shipyard - postgres: - username: shipyard - database: shipyard - airflow: - postgres: - username: airflow - database: airflow - oslo_messaging: - username: rabbitmq - maas: - admin: - username: admin - email: none@none - postgres: - username: maas - database: maasdb - barbican: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: barbican - oslo_db: - username: barbican - database: barbican - oslo_messaging: - admin: - username: rabbitmq - keystone: - username: keystone - armada: - keystone: - project_domain_name: default - user_domain_name: default - project_name: service - region_name: RegionOne - role: admin - user_domain_name: default - username: armada - deckhand: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: deckhand - postgres: - username: deckhand - database: deckhand - ceph: - swift: - keystone: - role: admin - region_name: RegionOne - username: swift - project_name: service - user_domain_name: default - project_domain_name: default -... diff --git a/deployment_files/site/gate-multinode/software/configs/endpoints.yaml b/deployment_files/site/gate-multinode/software/configs/endpoints.yaml deleted file mode 100644 index 5a8558af..00000000 --- a/deployment_files/site/gate-multinode/software/configs/endpoints.yaml +++ /dev/null @@ -1,235 +0,0 @@ ---- -schema: pegleg/EndpointCatalogue/v1 -metadata: - schema: metadata/Document/v1 - name: ucp_endpoints - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - ucp: - identity: - namespace: ucp - name: keystone - hosts: - default: keystone-api - public: keystone - host_fqdn_override: - default: null - path: - default: /v3 - scheme: - default: http - port: - admin: - default: 35357 - api: - default: 80 - armada: - name: armada - hosts: - default: armada-api - public: armada - port: - api: - default: 8000 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - deckhand: - name: deckhand - hosts: - default: deckhand-int - public: deckhand-api - port: - api: - default: 9000 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - postgresql: - name: postgresql - hosts: - default: postgresql - path: /DB_NAME - scheme: postgresql+psycopg2 - port: - postgresql: - default: 5432 - host_fqdn_override: - default: null - oslo_db: - hosts: - default: mariadb - discovery: mariadb-discovery - host_fqdn_override: - default: null - path: /DB_NAME - scheme: mysql+pymysql - port: - mysql: - default: 3306 - wsrep: - default: 4567 - key_manager: - name: barbican - hosts: - default: barbican-api - public: barbican - host_fqdn_override: - default: null - path: - default: /v1 - scheme: - default: http - port: - api: - default: 9311 - public: 80 - oslo_messaging: - namespace: null - hosts: - default: rabbitmq - host_fqdn_override: - default: null - path: /openstack - scheme: rabbit - port: - amqp: - default: 5672 - oslo_cache: - hosts: - default: memcached - host_fqdn_override: - default: null - port: - memcache: - default: 11211 - physicalprovisioner: - name: drydock - hosts: - default: drydock-api - port: - api: - default: 9000 - nodeport: 31900 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - maas_region_ui: - name: maas-region-ui - hosts: - default: maas-region-ui - public: maas - path: - default: /MAAS - scheme: - default: "http" - port: - region_ui: - default: 80 - public: 80 - host_fqdn_override: - default: null - kubernetesprovisioner: - name: promenade - hosts: - default: promenade-api - port: - api: - default: 80 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - shipyard: - name: shipyard - hosts: - default: shipyard-int - public: shipyard-api - port: - api: - default: 9000 - public: 80 - path: - default: /api/v1.0 - scheme: - default: http - host_fqdn_override: - default: null - airflow_web: - name: airflow-web - hosts: - default: airflow-web-int - public: airflow-web - port: - airflow_web: - default: 8080 - path: - default: / - scheme: - default: http - host_fqdn_override: - default: null - airflow_flower: - name: airflow-flower - hosts: - default: airflow-flower - port: - airflow_flower: - default: 5555 - path: - default: / - scheme: - default: http - host_fqdn_override: - default: null - ceph: - object_store: - name: swift - namespace: ceph - hosts: - default: ceph-rgw - host_fqdn_override: - default: null - path: - default: /swift/v1 - scheme: - default: http - port: - api: - default: 8088 - ceph_mon: - namespace: ceph - hosts: - default: ceph-mon - discovery: ceph-mon-discovery - host_fqdn_override: - default: null - port: - mon: - default: 6789 - ceph_mgr: - namespace: ceph - hosts: - default: ceph-mgr - host_fqdn_override: - default: null - port: - mgr: - default: 7000 - scheme: - default: http -... diff --git a/deployment_files/site/gate-multinode/software/configs/service_accounts.yaml b/deployment_files/site/gate-multinode/software/configs/service_accounts.yaml deleted file mode 100644 index 50e1abc4..00000000 --- a/deployment_files/site/gate-multinode/software/configs/service_accounts.yaml +++ /dev/null @@ -1,124 +0,0 @@ ---- -schema: pegleg/AccountCatalogue/v1 -metadata: - schema: metadata/Document/v1 - name: ucp_service_accounts - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - ucp: - postgres: - admin: - username: postgres - oslo_db: - admin: - username: root - oslo_messaging: - admin: - username: rabbitmq - keystone: - admin: - region_name: RegionOne - username: admin - project_name: admin - user_domain_name: default - project_domain_name: default - oslo_messaging: - admin: - username: rabbitmq - keystone: - username: keystone - oslo_db: - username: keystone - database: keystone - promenade: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: promenade - drydock: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: drydock - postgres: - username: drydock - database: drydock - shipyard: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: shipyard - postgres: - username: shipyard - database: shipyard - airflow: - postgres: - username: airflow - database: airflow - oslo_messaging: - username: rabbitmq - maas: - admin: - username: admin - email: none@none - postgres: - username: maas - database: maasdb - barbican: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: barbican - oslo_db: - username: barbican - database: barbican - oslo_messaging: - admin: - username: rabbitmq - keystone: - username: keystone - armada: - keystone: - project_domain_name: default - user_domain_name: default - project_name: service - region_name: RegionOne - role: admin - user_domain_name: default - username: armada - deckhand: - keystone: - region_name: RegionOne - role: admin - project_name: service - project_domain_name: default - user_domain_name: default - username: deckhand - postgres: - username: deckhand - database: deckhand - ceph: - swift: - keystone: - role: admin - region_name: RegionOne - username: swift - project_name: service - user_domain_name: default - project_domain_name: default -... diff --git a/deployment_files/site/gate-multinode/software/configs/versions.yaml b/deployment_files/site/gate-multinode/software/configs/versions.yaml index ac5ad6d6..0e8abbcc 100644 --- a/deployment_files/site/gate-multinode/software/configs/versions.yaml +++ b/deployment_files/site/gate-multinode/software/configs/versions.yaml @@ -13,35 +13,8 @@ metadata: - method: merge path: . storagePolicy: cleartext -data: - # TODO(sh8121att) - Update all of these when PS are merged - charts: - ucp: - shipyard: - location: https://git.openstack.org/openstack/airship-shipyard - reference: master - shipyard-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra - reference: master - drydock: - location: https://git.openstack.org/openstack/airship-drydock - reference: e35712a57318cb58b7e8c7f55181031d73e89aa5 - maas: - location: https://git.openstack.org/openstack/airship-maas - reference: refs/changes/65/577565/9 - images: - ucp: - drydock: - drydock: docker.io/sthussey/drydock:fixesv1 - drydock_db_sync: docker.io/sthussey/drydock:fixesv1 - shipyard: - airflow: quay.io/airshipit/airflow:master - shipyard: quay.io/airshipit/shipyard:master - shipyard_db_sync: quay.io/airshipit/shipyard:master - airflow_db_sync: quay.io/airshipit/airflow:master - maas: - maas_rack: docker.io/sthussey/maas-rack-controller:lvfixv2 - deckhand: - deckhand: quay.io/airshipit/deckhand:84ab5c5096826a6382d224271c75adee8d10e742 - db_sync: quay.io/airshipit/deckhand:84ab5c5096826a6382d224271c75adee8d10e742 +data: {} +# This document is merged with the globals, and is where you can override +# versions to match a patchset, for example. Anything specified in the global +# versions can be overridden, such as chart or image versions. ... diff --git a/manifests/common/deploy-airship.sh b/manifests/common/deploy-airship.sh index 1d7d5708..aaf70f06 100755 --- a/manifests/common/deploy-airship.sh +++ b/manifests/common/deploy-airship.sh @@ -78,8 +78,9 @@ SHIPYARD_REPO=${SHIPYARD_REPO:-"https://git.openstack.org/openstack/airship-ship SHIPYARD_REFSPEC=${SHIPYARD_REFSPEC:-""} # Images +# TODO(bryan-strassner) refit to use master Pegleg PEGLEG_IMAGE=${PEGLEG_IMAGE:-"quay.io/airshipit/pegleg:1ada48cc360ec52c7ab28b96c28a0c7df8bcee40"} -PROMENADE_IMAGE=${PROMENADE_IMAGE:-"quay.io/airshipit/promenade:latest"} +PROMENADE_IMAGE=${PROMENADE_IMAGE:-"quay.io/airshipit/promenade:master"} # Command shortcuts PEGLEG=${WORKSPACE}/airship-pegleg/tools/pegleg.sh diff --git a/tools/multi_nodes_gate/README.rst b/tools/multi_nodes_gate/README.rst new file mode 100644 index 00000000..c684a36d --- /dev/null +++ b/tools/multi_nodes_gate/README.rst @@ -0,0 +1,51 @@ +.. + Copyright 2018 AT&T Intellectual Property. + All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); you may + not use this file except in compliance with the License. You may obtain + a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + License for the specific language governing permissions and limitations + under the License. + +.. _gates: + +Gates +===== +Airship-in-a-bottle contains the multi_node_gates utility to aid developers +and automation of Airship. These tools are found in tools/multi_node_gates. + +Setup and Use +------------- + +1. First time, and only needed once per node, ./setup_gate.sh will prepare the + node for use by setting up the necessary users, virsh and some dependencies. +2. gate.sh is the starting point to run each of the named gates, found in + ./airship_gate/manifests, e.g.:: + + $ ./gate.sh multinode_genesis + + where the argument for the gate.sh script is the filename of the json file + in ./airship_gate/manifests without the json extension. + +Each of the defined manifests used for the gate defines a virtual machine +configuration, and the steps to run as part of that gate. Additional +information found in each file is a configuration that targets a particular +set of Airship site configurations, which in some of the provided manifests are +found in the deployment_files/site directory. + +Other Utilities +--------------- +Several useful utilities are found in ./airship_gate/bin to facilitate +interactions with the VMs created. These commands are effectively wrapped +scripts providing the functionality of the utility they wrap, but also +incorporating the necessary identifying information needed for a particular +run of a gate. E.g.:: + + $ ./airship_gate/bin/ssh.sh n0 diff --git a/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json b/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json new file mode 100644 index 00000000..c236984f --- /dev/null +++ b/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json @@ -0,0 +1,68 @@ +{ + "configuration": { + "site": "gate-multinode", + "primary_repo": "deployment_files", + "aux_repos": [] + }, + "stages": [ + { + "name": "Gate Setup", + "script": "gate-setup.sh" + }, + { + "name": "Pegleg Collection", + "script": "pegleg-collect.sh" + }, + { + "name": "Populate Image Cache", + "script": "registry-load.sh" + }, + { + "name": "Generate Certificates", + "script": "generate-certificates.sh" + }, + { + "name": "Build Scripts", + "script": "build-scripts.sh" + }, + { + "name": "Create VMs", + "script": "create-vms.sh" + }, + { + "name": "Genesis", + "script": "genesis.sh", + "on_error": "collect_genesis_info.sh" + } + ], + "vm": { + "n0" : { + "memory": 18432, + "vcpus": 8, + "mac": "52:54:00:00:a4:31", + "ip": "172.24.1.10", + "bootstrap": true + }, + "n1" : { + "memory": 2816, + "vcpus": 2, + "mac": "52:54:00:00:a3:31", + "ip": "172.24.1.11", + "bootstrap": false + }, + "n2" : { + "memory": 2816, + "vcpus": 2, + "mac": "52:54:00:1a:95:0d", + "ip": "172.24.1.12", + "bootstrap": false + }, + "n3" : { + "memory": 2816, + "vcpus": 2, + "mac": "52:54:00:31:c2:36", + "ip": "172.24.1.13", + "bootstrap": false + } + } +} diff --git a/tools/multi_nodes_gate/airship_gate/manifests/one.json b/tools/multi_nodes_gate/airship_gate/manifests/one.json new file mode 100644 index 00000000..791e98fb --- /dev/null +++ b/tools/multi_nodes_gate/airship_gate/manifests/one.json @@ -0,0 +1,22 @@ +{ + "configuration": {}, + "stages": [ + { + "name": "Gate Setup", + "script": "gate-setup.sh" + }, + { + "name": "Create VMs", + "script": "create-vms.sh" + } + ], + "vm": { + "n0" : { + "memory": 20000, + "vcpus": 8, + "mac": "52:54:00:00:a4:31", + "ip": "172.24.1.10", + "bootstrap": true + } + } +} diff --git a/tools/run_openstack_cli.sh b/tools/run_openstack_cli.sh index 68447f01..cf3bac55 100755 --- a/tools/run_openstack_cli.sh +++ b/tools/run_openstack_cli.sh @@ -17,7 +17,7 @@ set -e # Define variables COMMAND='openstack' -OPENSTACK_CLI_IMAGE="${OPENSTACK_CLI_IMAGE:-docker.io/openstackhelm/heat:newton}" +OPENSTACK_CLI_IMAGE="${OPENSTACK_CLI_IMAGE:-docker.io/openstackhelm/heat:ocata}" # Get the path of the directory where the script is located # Source Base Docker Command