airship
/
promenade
Code Issues Proposed changes

Fix: Issues with integration gate 

* Armada document schema errors
* Update for a few breaking changes in OSH charts

Change-Id: I84f32ad01ae5f2847602ad51ceae7a225dfd4c94
This commit is contained in:
Mark Burnett 2018-03-12 08:29:36 -05:00
parent f5947663f5
commit 47bf886ddd
2 changed files with 109 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
examples/complete/armada-resources.yaml
View File

@ -1142,8 +1142,6 @@ data:
timeout: 3600 timeout: 3600
wait: wait:
timeout: 3600 timeout: 3600
install:
no_hooks: true
upgrade: upgrade:
no_hooks: false no_hooks: false
pre: pre:
@ -1151,33 +1149,34 @@ data:
- name: ceph-mds-keyring-generator - name: ceph-mds-keyring-generator
type: job type: job
labels: labels:
- application: ceph application: ceph
- component: mds-keyring-generator component: mds-keyring-generator
- release_group: armada-ucp release_group: armada-ucp
- name: ceph-mon-keyring-generator - name: ceph-mon-keyring-generator
type: job type: job
labels: labels:
- application: ceph application: ceph
- component: mon-keyring-generator component: mon-keyring-generator
- release_group: armada-ucp release_group: armada-ucp
- name: ceph-rgw-keyring-generator - name: ceph-rgw-keyring-generator
type: job type: job
labels: labels:
- application: ceph application: ceph
- component: rgw-keyring-generator component: rgw-keyring-generator
- release_group: armada-ucp release_group: armada-ucp
- name: ceph-storage-keys-generator - name: ceph-storage-keys-generator
type: job type: job
labels: labels:
- application: ceph application: ceph
- component: storage-keys-generator component: storage-keys-generator
- release_group: armada-ucp release_group: armada-ucp
- name: ceph-osd-keyring-generator - name: ceph-osd-keyring-generator
type: job type: job
labels: labels:
- application: ceph application: ceph
- component: osd-keyring-generator component: osd-keyring-generator
- release_group: armada-ucp release_group: armada-ucp
values: values:
labels: labels:
job: job:
@ -1193,10 +1192,6 @@ data:
namespace: ceph namespace: ceph
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph
ceph:
rgw_keystone_auth: true
storage:
osd_directory: /var/lib/openstack-helm/ceph/osd
network: network:
public: 192.168.77.0/24 public: 192.168.77.0/24
cluster: 192.168.77.0/24 cluster: 192.168.77.0/24
@ -1209,11 +1204,24 @@ data:
rgw_keystone_user_and_endpoints: false rgw_keystone_user_and_endpoints: false
bootstrap: bootstrap:
enabled: true enabled: true
conf: conf:
ceph: ceph:
config: global:
global: osd_pool_default_size: 1
osd_pool_default_size: 1 osd:
osd_crush_chooseleaf_type: 0
features:
rgw: false
pool:
crush:
tunables: 'hammer'
target:
osd: 1
pg_per_osd: 100
default:
crush_rule: same_host
images: images:
tags: tags:
ceph_bootstrap: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 ceph_bootstrap: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04
@ -1248,8 +1256,6 @@ data:
timeout: 3600 timeout: 3600
wait: wait:
timeout: 3600 timeout: 3600
install:
no_hooks: false
upgrade: upgrade:
no_hooks: false no_hooks: false
pre: pre:
@ -1257,9 +1263,9 @@ data:
- name: ceph-namespace-client-key-generator - name: ceph-namespace-client-key-generator
type: job type: job
labels: labels:
- application: ceph application: ceph
- component: namespace-client-key-generator component: namespace-client-key-generator
- release_group: armada-ucp release_group: armada-ucp
values: values:
images: images:
tags: tags:
@ -1282,8 +1288,6 @@ data:
namespace: ceph namespace: ceph
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph
ceph:
rgw_keystone_auth: true
network: network:
public: 192.168.77.0/24 public: 192.168.77.0/24
cluster: 192.168.77.0/24 cluster: 192.168.77.0/24
@ -1314,10 +1318,6 @@ data:
chart_name: ucp-mariadb chart_name: ucp-mariadb
release: ucp-mariadb release: ucp-mariadb
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
timeout: 3600 timeout: 3600
wait: wait:
timeout: 3600 timeout: 3600
@ -1330,6 +1330,9 @@ data:
server: server:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
node_selector_value: enabled node_selector_value: enabled
prometheus_mysql_exporter:
node_selector_key: ucp-control-plane
node_selector_value: enabled
pod: pod:
replicas: replicas:
server: 1 server: 1
@ -1352,18 +1355,15 @@ data:
chart_name: ucp-memcached chart_name: ucp-memcached
release: ucp-memcached release: ucp-memcached
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
values: values:
images: images:
tags: tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
memcached: docker.io/memcached:1.4 memcached: docker.io/memcached:1.5.5
labels: labels:
node_selector_key: ucp-control-plane server:
node_selector_value: enabled node_selector_key: ucp-control-plane
node_selector_value: enabled
source: source:
type: git type: git
location: https://git.openstack.org/openstack/openstack-helm location: https://git.openstack.org/openstack/openstack-helm
@ -1383,23 +1383,18 @@ data:
chart_name: ucp-keystone chart_name: ucp-keystone
release: keystone release: keystone
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade: upgrade:
no_hooks: false no_hooks: false
pre: pre:
delete: delete:
- name: keystone-db-sync - name: keystone-db-sync
type: job type: job
labels: labels:
- job-name: keystone-db-sync job-name: keystone-db-sync
- name: keystone-db-init - name: keystone-db-init
type: job type: job
labels: labels:
- job-name: keystone-db-init job-name: keystone-db-init
post:
delete: []
create: []
values: values:
conf: conf:
keystone: keystone:
@ -1409,22 +1404,29 @@ data:
images: images:
tags: tags:
bootstrap: docker.io/openstackhelm/heat:newton 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
keystone_api: docker.io/kolla/ubuntu-source-keystone:3.0.3
keystone_credential_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3
keystone_credential_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3
keystone_db_sync: docker.io/kolla/ubuntu-source-keystone:3.0.3
keystone_fernet_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3
keystone_fernet_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3
test: docker.io/kolla/ubuntu-source-rally:4.0.0 test: docker.io/kolla/ubuntu-source-rally:4.0.0
db_init: docker.io/openstackhelm/heat:newton
keystone_db_sync: docker.io/openstackhelm/keystone:newton
db_drop: docker.io/openstackhelm/heat:newton
ks_user: docker.io/openstackhelm/heat:newton
rabbit_init: docker.io/rabbitmq:3.7.3-management
keystone_fernet_setup: docker.io/openstackhelm/keystone:newton
keystone_fernet_rotate: docker.io/openstackhelm/keystone:newton
keystone_credential_setup: docker.io/openstackhelm/keystone:newton
keystone_credential_rotate: docker.io/openstackhelm/keystone:newton
keystone_api: docker.io/openstackhelm/keystone:newton
keystone_domain_manage: docker.io/openstackhelm/keystone:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
pod: pod:
replicas: replicas:
api: 1 api: 1
labels: labels:
node_selector_key: ucp-control-plane api:
node_selector_value: enabled node_selector_key: ucp-control-plane
node_selector_value: enabled
job:
node_selector_key: ucp-control-plane
node_selector_value: enabled
source: source:
type: git type: git
location: https://git.openstack.org/openstack/openstack-helm location: https://git.openstack.org/openstack/openstack-helm
@ -1444,22 +1446,18 @@ data:
chart_name: maas-postgresql chart_name: maas-postgresql
release: maas-postgresql release: maas-postgresql
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete: []
create: []
post:
delete: []
create: []
values: values:
development: development:
enabled: false enabled: false
endpoints:
postgresql:
auth:
admin:
password: sergtsop
labels: labels:
node_selector_key: ucp-control-plane server:
node_selector_value: enabled node_selector_key: ucp-control-plane
node_selector_value: enabled
images: images:
tags: tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
@ -1484,10 +1482,13 @@ data:
chart_name: maas chart_name: maas
release: maas release: maas
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade: upgrade:
no_hooks: false no_hooks: false
pre:
delete:
- type: 'job'
labels:
application: 'maas'
values: values:
endpoints: endpoints:
maas_db: maas_db:
@ -1497,13 +1498,14 @@ data:
password: sergtsop password: sergtsop
images: images:
tags: tags:
bootstrap: sthussey/maas-region-controller:2.3 bootstrap: sthussey/maas-region-controller:2.3_patchv4
db_init: docker.io/postgres:9.5 db_init: docker.io/postgres:9.5
db_sync: sthussey/maas-region-controller:2.3 db_sync: sthussey/maas-region-controller:2.3_patchv4
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
export_api_key: sthussey/maas-region-controller:2.3 export_api_key: sthussey/maas-region-controller:2.3_patchv4
maas_rack: sthussey/maas-rack-controller:2.3 maas_rack: sthussey/maas-rack-controller:2.3
maas_region: sthussey/maas-region-controller:2.3 maas_region: sthussey/maas-region-controller:2.3_patchv4
maas_cache: quay.io/attcomdev/sstream-cache:latest
labels: labels:
rack: rack:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
@ -1560,19 +1562,12 @@ data:
chart_name: ucp-rabbitmq chart_name: ucp-rabbitmq
release: rabbitmq release: rabbitmq
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete: []
post:
delete: []
create: []
values: values:
images: images:
tags: tags:
rabbitmq: docker.io/rabbitmq:3.7 prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0
prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:newton
rabbitmq: docker.io/rabbitmq:3.7.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
pod: pod:
replicas: replicas:
@ -1603,15 +1598,6 @@ data:
chart_name: ucp-barbican chart_name: ucp-barbican
release: barbican release: barbican
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete: []
post:
delete: []
create: []
values: values:
pod: pod:
replicas: replicas:
@ -1620,20 +1606,22 @@ data:
job: job:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
node_selector_value: enabled node_selector_value: enabled
node_selector_key: ucp-control-plane api:
node_selector_value: enabled node_selector_key: ucp-control-plane
node_selector_value: enabled
images: images:
tags: tags:
barbican_api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
barbican_db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
bootstrap: docker.io/openstackhelm/heat:newton 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
ks_endpoints: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton
ks_user: docker.io/openstackhelm/heat:newton
scripted_test: docker.io/openstackhelm/heat:newton 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
rabbit_init: docker.io/rabbitmq:3.7.3-management
source: source:
type: git type: git
location: https://git.openstack.org/openstack/openstack-helm location: https://git.openstack.org/openstack/openstack-helm
@ -1656,14 +1644,14 @@ data:
timeout: 600 timeout: 600
wait: wait:
timeout: 600 timeout: 600
install:
no_hooks: false
upgrade:
no_hooks: false
values: values:
labels: labels:
node_selector_key: ucp-control-plane server:
node_selector_value: enabled node_selector_key: ucp-control-plane
node_selector_value: enabled
error_server:
node_selector_key: ucp-control-plane
node_selector_value: enabled
images: images:
tags: tags:
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
@ -1691,10 +1679,6 @@ data:
chart_name: tiller chart_name: tiller
release: tiller release: tiller
namespace: kube-system namespace: kube-system
install:
no_hooks: false
upgrade:
no_hooks: false
values: values:
images: images:
tags: tags:
@ -1722,10 +1706,6 @@ data:
chart_name: deckhand chart_name: deckhand
release: deckhand release: deckhand
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
values: values:
endpoints: endpoints:
postgresql: postgresql:
@ -1773,10 +1753,6 @@ data:
chart_name: drydock chart_name: drydock
release: drydock release: drydock
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
values: values:
images: images:
tags: tags:
@ -1868,10 +1844,6 @@ data:
chart_name: armada chart_name: armada
release: armada release: armada
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
values: values:
manifests: manifests:
deployment_tiller: false deployment_tiller: false
@ -1915,10 +1887,6 @@ data:
chart_name: shipyard chart_name: shipyard
release: shipyard release: shipyard
namespace: ucp namespace: ucp
install:
no_hooks: false
upgrade:
no_hooks: false
values: values:
endpoints: endpoints:
postgresql_airflow_db: postgresql_airflow_db:

2
tools/g2/lib/registry.sh
View File

@ -47,7 +47,7 @@ registry_populate() {
registry_replace_references() { registry_replace_references() {
FILES=(${@}) FILES=(${@})
for image in $(registry_list_images); do for image in $(registry_list_images); do
sed -i "s;${image};registry:5000/${image};g" "${FILES[@]}" sed -i "s;${image}\$;registry:5000/${image};g" "${FILES[@]}"
done done
} }