Update for master ONAP
Updated images
Updated persistence overrides
Updated repo overrides
Allow for extraction to different directory
Added full profile
Added retry of synchronize to jumphost as it seems to timeout in come cases.
Change-Id: I54953141f2616567c41070f29e1ffac42eb6923a
Signed-off-by: afenner <andrew.fenner@est.tech>
diff --git a/playbooks/roles/bootstrap-jumphost/tasks/configure-helm-offline-deployment.yaml b/playbooks/roles/bootstrap-jumphost/tasks/configure-helm-offline-deployment.yaml
index b13c35e..d2eb855 100644
--- a/playbooks/roles/bootstrap-jumphost/tasks/configure-helm-offline-deployment.yaml
+++ b/playbooks/roles/bootstrap-jumphost/tasks/configure-helm-offline-deployment.yaml
@@ -19,7 +19,7 @@
- name: Copy helm charts into local - offline
copy:
- src: /opt/engine/onap/offline/git/charts/
+ src: "{{ engine_workspace }}/onap/offline/git/charts/"
dest: /root/.helm/repository/local/
remote_src: true
become: true
diff --git a/playbooks/roles/bootstrap-jumphost/tasks/configure-offline-deployment.yaml b/playbooks/roles/bootstrap-jumphost/tasks/configure-offline-deployment.yaml
index cb6a3c6..1a469dc 100644
--- a/playbooks/roles/bootstrap-jumphost/tasks/configure-offline-deployment.yaml
+++ b/playbooks/roles/bootstrap-jumphost/tasks/configure-offline-deployment.yaml
@@ -17,11 +17,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
+- name: Ensure {{ engine_workspace }} exists
+ file:
+ path: "{{ engine_workspace }}"
+ state: directory
+ mode: '0755'
+
- name: Synchronize dependencies with jumphost
synchronize:
- src: /opt/engine/offline
- dest: /opt/engine/onap
+ src: "{{ engine_workspace }}/offline"
+ dest: "{{ engine_workspace }}/onap"
recursive: true
delete: true
+ register: result
+ retries: 3
+ delay: 10
+ until: result is not failed
# vim: set ts=2 sw=2 expandtab:
diff --git a/playbooks/roles/package/defaults/main.yaml b/playbooks/roles/package/defaults/main.yaml
index e30dc7b..75e69d7 100644
--- a/playbooks/roles/package/defaults/main.yaml
+++ b/playbooks/roles/package/defaults/main.yaml
@@ -24,138 +24,471 @@
pkg_folder: "{{ offline_pkg_folder }}/pkg"
other_images:
- envsubst_1:
- repo: dibi/envsubst
- tag: latest
- k8s-mariadb-galera-centos_2:
- repo: nexus3.onap.org:10001/adfinissygroup/k8s-mariadb-galera-centos
- tag: v002
- busybox_3:
+ haproxy_0:
+ repo: aaionap/haproxy
+ tag: 1.4.2
+ alpine_1:
+ repo: alpine
+ tag: 3.6
+ elasticsearch_2:
+ repo: bitnami/elasticsearch
+ tag: 7.6.1
+ kubectl_3:
+ repo: bitnami/kubectl
+ tag: 1.15
+ nginx_4:
+ repo: bitnami/nginx
+ tag: 1.16-debian-9
+ busybox_5:
+ repo: busybox
+ tag: '1.30'
+ busybox_6:
repo: busybox
tag: latest
- busybox_4:
- repo: nexus3.onap.org:10001/busybox
- tag: '1.30'
- busybox_5:
- repo: nexus3.onap.org:10001/busybox
- tag: 1.32.0
- consul_6:
- repo: nexus3.onap.org:10001/consul
- tag: 1.7.1
- filebeat_7:
+ consul_7:
+ repo: consul
+ tag: 1.4.3
+ crunchy-postgres_8:
+ repo: crunchydata/crunchy-postgres
+ tag: centos7-10.11-4.2.1
+ crunchy-postgres_9:
+ repo: crunchydata/crunchy-postgres
+ tag: centos7-10.3-1.8.2
+ envsubst_10:
+ repo: dibi/envsubst
+ tag: 1
+ envsubst_11:
+ repo: dibi/envsubst
+ tag: latest
+ filebeat_12:
repo: docker.elastic.co/beats/filebeat
tag: 5.5.0
- cassandra_8:
+ elasticsearch_13:
+ repo: docker.elastic.co/elasticsearch/elasticsearch
+ tag: 6.1.2
+ haproxy_14:
+ repo: docker.io/aaionap/haproxy
+ tag: 1.4.2
+ elasticsearch_15:
+ repo: docker.io/bitnami/elasticsearch
+ tag: 7.6.1
+ nginx_16:
+ repo: docker.io/bitnami/nginx
+ tag: 1.16-debian-9
+ busybox_17:
+ repo: docker.io/busybox
+ tag: '1.30'
+ busybox_18:
+ repo: docker.io/library/busybox
+ tag: latest
+ etcd-amd64_20:
+ repo: k8s.gcr.io/etcd-amd64
+ tag: 3.2.24
+ mariadb_21:
+ repo: docker.io/library/mariadb
+ tag: 10
+ mariadb_22:
+ repo: mariadb
+ tag: 10
+ k8s-mariadb-galera-centos_23:
+ repo: nexus3.onap.org:10001/adfinissygroup/k8s-mariadb-galera-centos
+ tag: v002
+ 10001_24:
+ repo: nexus3.onap.org:10001/busybox
+ tag: latest
+ consul_25:
+ repo: nexus3.onap.org:10001/consul
+ tag: 1.0.6
+ cassandra_26:
repo: nexus3.onap.org:10001/library/cassandra
tag: 3.11.4
- aaf_agent_9:
+ consul_27:
+ repo: nexus3.onap.org:10001/library/consul
+ tag: 1.7.1
+ vault_28:
+ repo: nexus3.onap.org:10001/library/vault
+ tag: 1.3.3
+ mariadb_29:
+ repo: nexus3.onap.org:10001/mariadb
+ tag: 10.1.38
+ mariadb_30:
+ repo: nexus3.onap.org:10001/mariadb
+ tag: 10.5.4
+ aaf_agent_31:
repo: nexus3.onap.org:10001/onap/aaf/aaf_agent
tag: 2.1.20
- aaf_cass_10:
+ aaf_cass_32:
repo: nexus3.onap.org:10001/onap/aaf/aaf_cass
tag: 2.1.23
- aaf_config_11:
+ aaf_config_33:
repo: nexus3.onap.org:10001/onap/aaf/aaf_config
tag: 2.1.23
- aaf_core_12:
+ aaf_core_34:
repo: nexus3.onap.org:10001/onap/aaf/aaf_core
tag: 2.1.23
- distcenter_13:
+ distcenter_37:
repo: nexus3.onap.org:10001/onap/aaf/distcenter
tag: 4.0.0
- sms_14:
+ sms_38:
repo: nexus3.onap.org:10001/onap/aaf/sms
tag: 4.0.2
- smsquorumclient_15:
+ smsquorumclient_36:
repo: nexus3.onap.org:10001/onap/aaf/smsquorumclient
tag: 4.0.2
- testcaservice_16:
+ testcaservice_37:
repo: nexus3.onap.org:10001/onap/aaf/testcaservice
tag: 4.0.0
- dcae-be_17:
- repo: nexus3.onap.org:10001/onap/dcae-be
- tag: 1.3.4
- dcae-dt_18:
- repo: nexus3.onap.org:10001/onap/dcae-dt
- tag: 1.3.4
- dcae-fe_19:
- repo: nexus3.onap.org:10001/onap/dcae-fe
- tag: 1.3.4
- dcae-tools_20:
- repo: nexus3.onap.org:10001/onap/dcae-tools
- tag: 1.3.4
- dcae-tosca-app_21:
- repo: nexus3.onap.org:10001/onap/dcae-tosca-app
- tag: 1.3.3
- dmaap-mr_22:
+ aai-graphadmin_38:
+ repo: nexus3.onap.org:10001/onap/aai-graphadmin
+ tag: 1.7.1
+ aai-resources_39:
+ repo: nexus3.onap.org:10001/onap/aai-resources
+ tag: 1.7.2
+ aai-schema-service_40:
+ repo: nexus3.onap.org:10001/onap/aai-schema-service
+ tag: 1.7.12
+ aai-traversal_41:
+ repo: nexus3.onap.org:10001/onap/aai-traversal
+ tag: 1.7.2
+ babel_42:
+ repo: nexus3.onap.org:10001/onap/babel
+ tag: 1.7.1
+ ccsdk-apps-ms-neng_43:
+ repo: nexus3.onap.org:10001/onap/ccsdk-apps-ms-neng
+ tag: 1.0.2
+ ccsdk-blueprintsprocessor_44:
+ repo: nexus3.onap.org:10001/onap/ccsdk-blueprintsprocessor
+ tag: 1.0.1
+ ccsdk-cds-ui-server_45:
+ repo: nexus3.onap.org:10001/onap/ccsdk-cds-ui-server
+ tag: 1.0.1
+ ccsdk-commandexecutor_46:
+ repo: nexus3.onap.org:10001/onap/ccsdk-commandexecutor
+ tag: 1.0.1
+ ccsdk-dgbuilder-image_47:
+ repo: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image
+ tag: 1.0.2
+ ccsdk-py-executor_48:
+ repo: nexus3.onap.org:10001/onap/ccsdk-py-executor
+ tag: 1.0.1
+ ccsdk-sdclistener_49:
+ repo: nexus3.onap.org:10001/onap/ccsdk-sdclistener
+ tag: 1.0.1
+ clamp-backend_50:
+ repo: nexus3.onap.org:10001/onap/clamp-backend
+ tag: 5.1.5
+ clamp-dashboard-elasticsearch_51:
+ repo: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch
+ tag: 5.0.4
+ clamp-dashboard-kibana_52:
+ repo: nexus3.onap.org:10001/onap/clamp-dashboard-kibana
+ tag: 5.0.4
+ clamp-dashboard-logstash_53:
+ repo: nexus3.onap.org:10001/onap/clamp-dashboard-logstash
+ tag: 5.0.4
+ clamp-frontend_54:
+ repo: nexus3.onap.org:10001/onap/clamp-frontend
+ tag: 5.1.5
+ data-router_55:
+ repo: nexus3.onap.org:10001/onap/data-router
+ tag: 1.7.0
+ datarouter-node_56:
+ repo: nexus3.onap.org:10001/onap/dmaap/datarouter-node
+ tag: 2.1.7
+ datarouter-prov_57:
+ repo: nexus3.onap.org:10001/onap/dmaap/datarouter-prov
+ tag: 2.1.7
+ dbc-client_58:
+ repo: nexus3.onap.org:10001/onap/dmaap/dbc-client
+ tag: 1.0.9
+ dmaap-bc_59:
+ repo: nexus3.onap.org:10001/onap/dmaap/dmaap-bc
+ tag: 2.0.4
+ dmaap-mr_60:
repo: nexus3.onap.org:10001/onap/dmaap/dmaap-mr
tag: 1.1.18
- kafka111_23:
+ kafka111_61:
repo: nexus3.onap.org:10001/onap/dmaap/kafka111
tag: 1.0.4
- zookeeper_24:
+ zookeeper_62:
repo: nexus3.onap.org:10001/onap/dmaap/zookeeper
tag: 6.0.3
- cassandra_music_25:
+ nbi_63:
+ repo: nexus3.onap.org:10001/onap/externalapi/nbi
+ tag: 7.0.2
+ engine-management_50:
+ repo: nexus3.onap.org:10001/onap/holmes/engine-management
+ tag: 1.2.9
+ rule-management_51:
+ repo: nexus3.onap.org:10001/onap/holmes/rule-management
+ tag: 1.2.9
+ model-loader_64:
+ repo: nexus3.onap.org:10001/onap/model-loader
+ tag: 1.7.0
+ msb_apigateway_65:
+ repo: nexus3.onap.org:10001/onap/msb/msb_apigateway
+ tag: 1.2.7
+ msb_discovery_66:
+ repo: nexus3.onap.org:10001/onap/msb/msb_discovery
+ tag: 1.2.6
+ azure_67:
+ repo: nexus3.onap.org:10001/onap/multicloud/azure
+ tag: 1.2.4
+ framework-artifactbroker_68:
+ repo: nexus3.onap.org:10001/onap/multicloud/framework-artifactbroker
+ tag: 1.6.0
+ framework_69:
+ repo: nexus3.onap.org:10001/onap/multicloud/framework
+ tag: 1.6.0
+ k8s_70:
+ repo: nexus3.onap.org:10001/onap/multicloud/k8s
+ tag: 0.7.0
+ openstack-fcaps_71:
+ repo: nexus3.onap.org:10001/onap/multicloud/openstack-fcaps
+ tag: 1.5.5
+ openstack-pike_72:
+ repo: nexus3.onap.org:10001/onap/multicloud/openstack-pike
+ tag: 1.5.5
+ openstack-starlingx_73:
+ repo: nexus3.onap.org:10001/onap/multicloud/openstack-starlingx
+ tag: 1.5.5
+ openstack-windriver_74:
+ repo: nexus3.onap.org:10001/onap/multicloud/openstack-windriver
+ tag: 1.5.5
+ vio_75:
+ repo: nexus3.onap.org:10001/onap/multicloud/vio
+ tag: 1.4.1
+ cassandra_music_76:
repo: nexus3.onap.org:10001/onap/music/cassandra_music
tag: 3.0.0
- certservice_api_26:
- repo: nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-api
- tag: 1.2.0
- portal-app_27:
+ kube2msb_77:
+ repo: nexus3.onap.org:10001/onap/oom/kube2msb
+ tag: 1.2.6
+ readiness_78:
+ repo: nexus3.onap.org:10001/onap/oom/readiness
+ tag: 3.0.1
+ org.onap.ccsdk.dashboard.ccsdk-app-os_79:
+ repo: nexus3.onap.org:10001/onap/org.onap.ccsdk.dashboard.ccsdk-app-os
+ tag: 1.4.0
+ org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web_85:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web
+ tag: 1.2.1
+ org.onap.dcaegen2.collectors.hv-ves.hv-collector-main_86:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main
+ tag: 1.5.0
+ org.onap.dcaegen2.collectors.ves.vescollector_87:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector
+ tag: 1.7.9
+ org.onap.dcaegen2.deployments.cm-container_88:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.cm-container
+ tag: 3.3.4
+ org.onap.dcaegen2.deployments.consul-loader-container_81:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.consul-loader-container
+ tag: 1.0.0
+ org.onap.dcaegen2.deployments.healthcheck-container_82:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.healthcheck-container
+ tag: 2.1.0
+ org.onap.dcaegen2.deployments.k8s-bootstrap-container_83:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container
+ tag: 2.1.8
+ org.onap.dcaegen2.deployments.multisite-init-container_84:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.multisite-init-container
+ tag: 1.0.0
+ org.onap.dcaegen2.deployments.tls-init-container_85:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tls-init-container
+ tag: 2.1.0
+ org.onap.dcaegen2.platform.configbinding_86:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding
+ tag: 2.5.3
+ org.onap.dcaegen2.platform.deployment-handler_87:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.deployment-handler
+ tag: 4.4.1
+ org.onap.dcaegen2.platform.inventory-api_88:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api
+ tag: 3.5.1
+ org.onap.dcaegen2.platform.policy-handler_89:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.policy-handler
+ tag: 5.1.0
+ org.onap.dcaegen2.platform.servicechange-handler_90:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler
+ tag: 1.4.0
+ org.onap.dcaegen2.services.prh.prh-app-server_99:
+ repo: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server
+ tag: 1.5.4
+ org.onap.oom.platform.cert-service.oom-certservice-client_100:
+ repo: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client
+ tag: 2.1.0
+ policy-apex-pdp_92:
+ repo: nexus3.onap.org:10001/onap/policy-apex-pdp
+ tag: 2.4.3
+ policy-api_93:
+ repo: nexus3.onap.org:10001/onap/policy-api
+ tag: 2.3.3
+ policy-distribution_94:
+ repo: nexus3.onap.org:10001/onap/policy-distribution
+ tag: 2.4.3
+ policy-pap_95:
+ repo: nexus3.onap.org:10001/onap/policy-pap
+ tag: 2.3.3
+ policy-pdpd-cl_96:
+ repo: nexus3.onap.org:10001/onap/policy-pdpd-cl
+ tag: 1.7.4
+ policy-xacml-pdp_97:
+ repo: nexus3.onap.org:10001/onap/policy-xacml-pdp
+ tag: 2.3.3
+ portal-app_98:
repo: nexus3.onap.org:10001/onap/portal-app
- tag: 3.2.3
- portal-db_28:
+ tag: 3.4.2
+ portal-db_99:
repo: nexus3.onap.org:10001/onap/portal-db
- tag: 3.2.3
- portal-sdk_29:
+ tag: 3.4.1
+ portal-sdk_100:
repo: nexus3.onap.org:10001/onap/portal-sdk
- tag: 3.2.0
- portal-wms_30:
+ tag: 3.4.2
+ portal-wms_101:
repo: nexus3.onap.org:10001/onap/portal-wms
- tag: 3.2.3
- sdc-backend-init_31:
+ tag: 3.4.2
+ sdc-backend-all-plugins_102:
+ repo: nexus3.onap.org:10001/onap/sdc-backend-all-plugins
+ tag: 1.7.2
+ sdc-backend-init_103:
repo: nexus3.onap.org:10001/onap/sdc-backend-init
- tag: 1.6.7
- sdc-backend_32:
- repo: nexus3.onap.org:10001/onap/sdc-backend
- tag: 1.6.7
- sdc-cassandra-init_33:
+ tag: 1.7.2
+ sdc-cassandra-init_104:
repo: nexus3.onap.org:10001/onap/sdc-cassandra-init
- tag: 1.6.7
- sdc-frontend_34:
+ tag: 1.7.2
+ sdc-frontend_105:
repo: nexus3.onap.org:10001/onap/sdc-frontend
- tag: 1.6.7
- sdc-onboard-backend_35:
+ tag: 1.7.2
+ sdc-onboard-backend_106:
repo: nexus3.onap.org:10001/onap/sdc-onboard-backend
- tag: 1.6.7
- sdc-onboard-cassandra-init_36:
+ tag: 1.7.2
+ sdc-onboard-cassandra-init_116:
repo: nexus3.onap.org:10001/onap/sdc-onboard-cassandra-init
- tag: 1.6.7
- workflow-backend_37:
- repo: nexus3.onap.org:10001/onap/workflow-backend
- tag: 1.6.4
- workflow-frontend_38:
- repo: nexus3.onap.org:10001/onap/workflow-frontend
- tag: 1.6.4
- workflow-init_39:
- repo: nexus3.onap.org:10001/onap/workflow-init
- tag: 1.6.4
- mariadb-client-init_40:
+ tag: 1.7.2
+ sdc-workflow-backend_117:
+ repo: nexus3.onap.org:10001/onap/sdc-workflow-backend
+ tag: 1.7.0
+ sdc-workflow-frontend_108:
+ repo: nexus3.onap.org:10001/onap/sdc-workflow-frontend
+ tag: 1.7.0
+ sdc-workflow-init_109:
+ repo: nexus3.onap.org:10001/onap/sdc-workflow-init
+ tag: 1.7.0
+ sdnc-ansible-server-image_110:
+ repo: nexus3.onap.org:10001/onap/sdnc-ansible-server-image
+ tag: 2.0.3
+ sdnc-dmaap-listener-image_111:
+ repo: nexus3.onap.org:10001/onap/sdnc-dmaap-listener-image
+ tag: 2.0.3
+ sdnc-image_112:
+ repo: nexus3.onap.org:10001/onap/sdnc-image
+ tag: 2.0.3
+ sdnc-ueb-listener-image_113:
+ repo: nexus3.onap.org:10001/onap/sdnc-ueb-listener-image
+ tag: 2.0.3
+ sdnc-web-image_114:
+ repo: nexus3.onap.org:10001/onap/sdnc-web-image
+ tag: 2.0.3
+ search-data-service_115:
+ repo: nexus3.onap.org:10001/onap/search-data-service
+ tag: 1.6.2
+ api-handler-infra_116:
+ repo: nexus3.onap.org:10001/onap/so/api-handler-infra
+ tag: 1.7.10
+ bpmn-infra_117:
+ repo: nexus3.onap.org:10001/onap/so/bpmn-infra
+ tag: 1.7.10
+ catalog-db-adapter_118:
+ repo: nexus3.onap.org:10001/onap/so/catalog-db-adapter
+ tag: 1.7.10
+ nssmf-adapter_119:
+ repo: nexus3.onap.org:10001/onap/so/nssmf-adapter
+ tag: 1.7.10
+ openstack-adapter_120:
+ repo: nexus3.onap.org:10001/onap/so/openstack-adapter
+ tag: 1.7.10
+ request-db-adapter_121:
+ repo: nexus3.onap.org:10001/onap/so/request-db-adapter
+ tag: 1.7.10
+ sdc-controller_122:
+ repo: nexus3.onap.org:10001/onap/so/sdc-controller
+ tag: 1.7.10
+ sdnc-adapter_123:
+ repo: nexus3.onap.org:10001/onap/so/sdnc-adapter
+ tag: 1.7.10
+ so-etsi-nfvo-ns-lcm_124:
+ repo: nexus3.onap.org:10001/onap/so/so-etsi-nfvo-ns-lcm
+ tag: 1.7.7
+ so-monitoring_125:
+ repo: nexus3.onap.org:10001/onap/so/so-monitoring
+ tag: 1.7.7
+ so-oof-adapter_126:
+ repo: nexus3.onap.org:10001/onap/so/so-oof-adapter
+ tag: 1.7.4
+ vfc-adapter_127:
+ repo: nexus3.onap.org:10001/onap/so/vfc-adapter
+ tag: 1.7.10
+ vnfm-adapter_128:
+ repo: nexus3.onap.org:10001/onap/so/vnfm-adapter
+ tag: 1.7.10
+ sparky-be_129:
+ repo: nexus3.onap.org:10001/onap/sparky-be
+ tag: 1.6.2
+ testsuite_130:
+ repo: nexus3.onap.org:10001/onap/testsuite
+ tag: 1.7.2
+ vid_131:
+ repo: nexus3.onap.org:10001/onap/vid
+ tag: 7.0.0
+ refrepo_132:
+ repo: nexus3.onap.org:10001/onap/vnfsdk/refrepo
+ tag: 1.6.2
+ consul_133:
+ repo: nexus3.onap.org:10001/oomk8s/consul
+ tag: 2.0.0
+ mariadb-client-init_134:
repo: nexus3.onap.org:10001/oomk8s/mariadb-client-init
tag: 3.0.0
- readiness-check_41:
+ ubuntu-init_135:
+ repo: oomk8s/ubuntu-init
+ tag: 1.0.0
+ rabbitmq_136:
+ repo: rabbitmq
+ tag: alpine
+ mongo_137:
+ repo: registry.hub.docker.com/library/mongo
+ tag: 4.0.8
+ ubuntu-init_138:
+ repo: oomk8s/ubuntu-init
+ tag: 2.0.0
+ readiness_139:
repo: nexus3.onap.org:10001/oomk8s/readiness-check
tag: 2.2.2
- ubuntu-init_42:
- repo: nexus3.onap.org:10001/oomk8s/ubuntu-init
- tag: 2.0.0
- vault_43:
- repo: nexus3.onap.org:10001/vault
- tag: 1.3.3
- zookeeper_44:
- repo: nexus3.onap.org:10001/zookeeper
- tag: '3.4'
+ esr-gui_140:
+ repo: nexus3.onap.org:10001/onap/aai/esr-gui
+ tag: 1.4.0
+ esr-server_141:
+ repo: nexus3.onap.org:10001/onap/aai/esr-server
+ tag: 1.5.2
+ oom-certservice-api_142:
+ repo: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-api
+ tag: 2.1.0
+ busybox_144:
+ repo: nexus3.onap.org:10001/library/busybox
+ tag: latest
+ mariadb_145:
+ repo: nexus3.onap.org:10001/library/mariadb
+ tag: 10
+ consul_146:
+ repo: nexus3.onap.org:10001/library/consul
+ tag: 1.4.3
+ etsicatalog_147:
+ repo: nexus3.onap.org:10001/onap/modeling/etsicatalog
+ tag: 1.0.9
+ consul_148:
+ repo: nexus3.onap.org:10001/oomk8s/consul
+ tag: 1.0.0
repositories:
oom:
repo: "https://gerrit.onap.org/r/oom"
diff --git a/playbooks/roles/package/files/decompress.sh b/playbooks/roles/package/files/decompress.sh
index 25c7570..19ae515 100755
--- a/playbooks/roles/package/files/decompress.sh
+++ b/playbooks/roles/package/files/decompress.sh
@@ -35,7 +35,7 @@
#---------------------------------------------------#
EOF
-ENGINE_WORKSPACE=/opt/engine
+ENGINE_WORKSPACE="${ENGINE_WORKSPACE:-"/opt/engine"}"
DESTINATION_FOLDER="$ENGINE_WORKSPACE/offline"
export ENGINE_WORKSPACE DESTINATION_FOLDER
diff --git a/playbooks/roles/package/tasks/containers.yaml b/playbooks/roles/package/tasks/containers.yaml
index cb0d4b6..96d86eb 100644
--- a/playbooks/roles/package/tasks/containers.yaml
+++ b/playbooks/roles/package/tasks/containers.yaml
@@ -38,7 +38,7 @@
changed_when: false
- name: pull images
- script: pull-images.sh -l {{ dockerpullfile.path }}
+ script: pull-images.sh -l {{ dockerpullfile.path }} -p 2
become: true
changed_when: false
@@ -51,7 +51,7 @@
- name: Save other container images
script:
/bin/echo {{ other_images[item.key].repo }}:{{ other_images[item.key].tag }} \
- -o {{ other_images[item.key].repo | replace('/', '_') }}_{{ other_images[item.key].tag }}.tar \
+ -o {{ other_images[item.key].repo | replace('/', '_') | replace(':', '_') }}_{{ other_images[item.key].tag }}.tar \
>> {{ dockersavefile.path }}
with_dict: "{{ other_images }}"
become: false
diff --git a/scenarios/files/onap-full-nofeature.yaml b/scenarios/files/onap-full-nofeature.yaml
new file mode 100644
index 0000000..cb82c73
--- /dev/null
+++ b/scenarios/files/onap-full-nofeature.yaml
@@ -0,0 +1,24 @@
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 The Nordix Foundation. 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+profilecheck:
+ timeout: 45
+ podlist: "-c sdc-fe"
+ storagepodlist: "-c cassandra"
+# vim: set ts=2 sw=2 expandtab:
diff --git a/scenarios/onap-full-nofeature.yaml b/scenarios/onap-full-nofeature.yaml
new file mode 100644
index 0000000..60f8b1c
--- /dev/null
+++ b/scenarios/onap-full-nofeature.yaml
@@ -0,0 +1,94 @@
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 The Nordix Foundation. 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# NOTE (fdegir): scenario specific preinstall tasks
+- hosts: localhost
+ connection: local
+ gather_facts: false
+ become: false
+ tags:
+ - preinstall
+
+ tasks:
+ - name: Copy scenario vars file {{ deploy_scenario }}.yaml into group_vars
+ copy:
+ src: "{{ deploy_scenario }}.yaml"
+ dest: "{{ engine_path }}/engine/inventory/group_vars/all/{{ deploy_scenario }}.yaml"
+ force: true
+
+
+- hosts: jumphost
+ gather_facts: true
+ become: false
+ tags:
+ - preinstall
+
+ tasks:
+ - name: Reload deployment variables for {{ execution_mode }}
+ include_vars: "{{ execution_mode }}.yaml"
+ - name: Create a directory to hold ONAP install files
+ file:
+ path: "{{ config_path }}/apps/onap"
+ state: directory
+ mode: '0755'
+
+ # Profile file countains override.yaml for ONAP helm charts to specify what is installed
+ - name: Create profile file
+ template:
+ src: "full-profile.yaml.j2"
+ dest: "{{ config_path }}/apps/onap/profile.yaml"
+ force: true
+
+ # Profile file countains override.yaml for ONAP helm charts to specify what is installed
+ - name: Create profile file for storage
+ template:
+ src: "sdc-profile-storage.yaml.j2"
+ dest: "{{ config_path }}/apps/onap/profile-storage.yaml"
+ force: true
+
+ # Profile file countains override.yaml for ONAP helm charts to specify persistence solution
+ - name: Create persistence override file
+ template:
+ src: "{{ execution_mode }}-persistence.yaml.j2"
+ dest: "{{ config_path }}/apps/onap/persistence.yaml"
+ force: true
+
+ - name: Create repos override file
+ template:
+ src: "{{ execution_mode }}-repos.yaml"
+ dest: "{{ config_path }}/apps/onap/repos.yaml"
+ force: true
+
+
+# NOTE (fdegir): common postinstall tasks
+- hosts: localhost
+ connection: local
+ gather_facts: false
+ become: false
+ tags:
+ - postinstall
+
+ tasks:
+ - name: Postinstall copy inventory file to required location
+ copy:
+ src: "{{ engine_path }}/engine/inventory/inventory.ini"
+ dest: "{{ config_path }}/inventory.ini"
+ force: true
+
+# vim: set ts=2 sw=2 expandtab:
diff --git a/scenarios/templates/full-profile.yaml.j2 b/scenarios/templates/full-profile.yaml.j2
new file mode 100644
index 0000000..8fa7461
--- /dev/null
+++ b/scenarios/templates/full-profile.yaml.j2
@@ -0,0 +1,85 @@
+global:
+ repository: "{{ onap_image_repository }}"
+ pullPolicy: IfNotPresent
+ masterPassword: "{{ onap_masterpassword }}"
+
+so:
+ enabled: true
+modeling:
+ enabled: true
+
+cassandra:
+ enabled: true
+mariadb-galera:
+ enabled: true
+appc:
+ enabled: false
+
+sdnc:
+ enabled: true
+
+aaf:
+ enabled: true
+aai:
+ enabled: true
+clamp:
+ enabled: false
+cds:
+ enabled: true
+cli:
+ enabled: false
+consul:
+ enabled: true
+contrib:
+ enabled: false
+dcaegen2:
+ enabled: true
+ pnda:
+ enabled: false
+dmaap:
+ enabled: true
+ dmaap-bc:
+ enabled: false
+ dmaap-dr-node:
+ enabled: false
+ dmaap-dr-prov:
+ enabled: false
+
+esr:
+ enabled: false
+log:
+ enabled: false
+sniro-emulator:
+ enabled: false
+oof:
+ enabled: false
+msb:
+ enabled: true
+multicloud:
+ enabled: true
+
+nbi:
+ enabled: false
+
+policy:
+ enabled: true
+pomba:
+ enabled: false
+portal:
+ enabled: true
+robot:
+ enabled: true
+platform:
+ enabled: true
+sdc:
+ enabled: true
+uui:
+ enabled: false
+vfc:
+ enabled: false
+vid:
+ enabled: true
+vnfsdk:
+ enabled: false
+vvp:
+ enabled: false
diff --git a/scenarios/templates/offline-deployment-persistence.yaml.j2 b/scenarios/templates/offline-deployment-persistence.yaml.j2
index cb70c9a..da978e1 100644
--- a/scenarios/templates/offline-deployment-persistence.yaml.j2
+++ b/scenarios/templates/offline-deployment-persistence.yaml.j2
@@ -1,5 +1,3 @@
-global:
- offlinestorageclass: "{{ storage_classname }}"
aaf:
aaf-cass:
persistence:
@@ -69,13 +67,16 @@
cds:
cds-blueprints-processor:
persistence:
- storageClass: "{{ storage_classname }}"
+ storageClass: "{{ storage_filesystem_classname }}"
cds-command-executor:
persistence:
storageClass: "{{ storage_classname }}"
cds-sdc-listener:
persistence:
storageClass: "{{ storage_classname }}"
+ mariadb-galera:
+ persistence:
+ storageClass: "{{ storage_classname }}"
persistence:
storageClass: "{{ storage_classname }}"
clamp:
@@ -91,7 +92,7 @@
clamp-dash-logstash:
persistence:
storageClass: "{{ storage_classname }}"
- mariadb:
+ clamp-mariadb:
persistence:
storageClass: "{{ storage_classname }}"
contrib:
@@ -113,34 +114,59 @@
persistence:
storageClass: "{{ storage_classname }}"
dcaegen2:
+ dcae-servicechange-handler:
+ dcae-inventory-api:
+ persistence:
+ storageClass: "{{ storage_classname }}"
+ dcae-dashboard:
+ postgres:
+ persistence:
+ needPV: false
+ storageClass: "{{ storage_classname }}"
dcae-bootstrap:
+ mongo:
+ persistence:
+ storageClass: "{{ storage_classname }}"
+ postgres:
+ persistence:
+ needPV: false
+ storageClass: "{{ storage_classname }}"
persistence:
storageClass: "{{ storage_classname }}"
dcae-cloudify-manager:
persistence:
storageClass: "{{ storage_classname }}"
- dcae-dashboard:
- persistence:
- storageClass: "{{ storage_classname }}"
dcae-inventory-api:
+ postgres:
+ persistence:
+ needPV: false
+ storageClass: "{{ storage_classname }}"
persistence:
storageClass: "{{ storage_classname }}"
dcae-redis:
persistence:
storageClass: "{{ storage_classname }}"
+ size: 50Mi
dgbuilder:
persistence:
storageClass: "{{ storage_classname }}"
dmaap:
dmaap-bc:
- persistence:
- storageClass: "{{ storage_classname }}"
+ postgres:
+ persistence:
+ needPV: false
+ storageClass: "{{ storage_classname }}"
dmaap-dr-node:
persistence:
storageClass: "{{ storage_classname }}"
+ event:
+ storageClass: "{{ storage_classname }}"
+ spool:
+ storageClass: "{{ storage_classname }}"
dmaap-dr-prov:
- persistence:
- storageClass: "{{ storage_classname }}"
+ mariadb:
+ persistence:
+ storageClass: "{{ storage_classname }}"
message-router:
message-router-kafka:
persistence:
@@ -168,6 +194,10 @@
mariadb-galera:
persistence:
storageClass: "{{ storage_classname }}"
+network-name-gen:
+ mariadb-galera:
+ persistence:
+ storageClass: "{{ storage_classname }}"
modeling:
modeling-etsicatalog:
persistence:
@@ -181,6 +211,12 @@
multicloud-k8s:
persistence:
storageClass: "{{ storage_classname }}"
+ mongo:
+ persistence:
+ storageClass: "{{ storage_classname }}"
+ etcd:
+ persistence:
+ storageClass: "{{ storage_classname }}"
multicloud-prometheus:
persistence:
storageClass: "{{ storage_classname }}"
@@ -206,8 +242,9 @@
persistence:
storageClass: "{{ storage_classname }}"
nbi:
- persistence:
- storageClass: "{{ storage_classname }}"
+ mongo:
+ persistence:
+ storageClass: "{{ storage_classname }}"
network-name-gen:
persistence:
storageClass: "{{ storage_classname }}"
@@ -249,6 +286,9 @@
policy-xacml-pdp:
persistence:
storageClass: "{{ storage_classname }}"
+ mariadb-galera:
+ persistence:
+ storageClass: "{{ storage_classname }}"
pomba:
pomba-data-router:
persistence:
@@ -274,6 +314,7 @@
storageClass: "{{ storage_classname }}"
postgres:
persistence:
+ needPV: false
storageClass: "{{ storage_classname }}"
robot:
persistence:
@@ -295,6 +336,13 @@
dmaap-listener:
persistence:
storageClass: "{{ storage_classname }}"
+ elasticsearch:
+ master:
+ persistence:
+ storageClass: "{{ storage_classname }}"
+ mariadb-galera:
+ persistence:
+ storageClass: "{{ storage_classname }}"
persistence:
storageClass: "{{ storage_classname }}"
sdnc-ansible-server:
@@ -352,8 +400,12 @@
persistence:
storageClass: "{{ storage_classname }}"
vid:
+ mariadb-galera:
+ persistence:
+ storageClass: "{{ storage_classname }}"
persistence:
storageClass: "{{ storage_classname }}"
vnfsdk:
- persistence:
- storageClass: "{{ storage_classname }}"
+ postgres:
+ persistence:
+ storageClass: "{{ storage_classname }}"
diff --git a/scenarios/templates/offline-deployment-repos.yaml b/scenarios/templates/offline-deployment-repos.yaml
index 18fc5df..5dd610e 100644
--- a/scenarios/templates/offline-deployment-repos.yaml
+++ b/scenarios/templates/offline-deployment-repos.yaml
@@ -35,12 +35,24 @@
tlsRepository: "{{ server_fqdn }}"
ubuntuInitRepository: "{{ server_fqdn }}/oomk8s"
envsubstImage: "{{ server_fqdn }}/dibi/envsubst"
+ kubectlImage: "engine.local/bitnami/kubectl:1.15"
aaf:
aaf-sms:
aaf-sms-vault:
image:
- consul: consul:1.7.1
- vault: vault:1.3.3
+ consul: library/consul:1.7.1
+ vault: library/vault:1.3.3
+policy:
+ mariadb_image: "{{ server_fqdn }}/library/mariadb:10"
+sdnc:
+ elasticsearch:
+ repositoryOverride: "{{ server_fqdn }}"
+ master:
+ repositoryOverride: "{{ server_fqdn }}"
+ curator:
+ repositoryOverride: "{{ server_fqdn }}"
+ data:
+ repositoryOverride: "{{ server_fqdn }}"
dmaap:
message-router:
message-router-zookeeper:
@@ -54,6 +66,7 @@
dmaap-dr-node:
busyBoxRepository: "{{ server_fqdn }}"
dmaap-bc:
+ repository: "{{ server_fqdn }}"
postgres:
repository: "{{ server_fqdn }}/crunchydata"
postgresRepository: "{{ server_fqdn }}/crunchydata"
@@ -95,6 +108,8 @@
persistence:
storageClass: "block-storage"
dcae-bootstrap:
+ mongo:
+ dockerHubRepository: "{{ server_fqdn }}/registry.hub.docker.com"
postgres:
repository: "{{ server_fqdn }}/crunchydata"
postgresRepository: "{{ server_fqdn }}/crunchydata"
@@ -112,6 +127,16 @@
postgresRepository: "{{ server_fqdn }}/crunchydata"
persistence:
storageClass: "block-storage"
+ dcae-inventory-api:
+ postgresRepository: "{{ server_fqdn }}/crunchydata"
+ postgres:
+ repository: "{{ server_fqdn }}/crunchydata"
+ postgresRepository: "{{ server_fqdn }}/crunchydata"
+ pgpool:
+ repository: "{{ server_fqdn }}/crunchydata"
+ postgresRepository: "{{ server_fqdn }}/crunchydata"
+ persistence:
+ storageClass: "block-storage"
vnfsdk:
postgresRepository: "{{ server_fqdn }}/crunchydata"
postgres:
@@ -125,7 +150,7 @@
multicloud:
multicloud-k8s:
etcd:
- repository: "{{ server_fqdn }}/google-containers"
+ repository: "{{ server_fqdn }}"
persistence:
storageClass: "block-storage"
mongo:
@@ -133,7 +158,7 @@
multicloud-fcaps:
rabbitmq: "{{ server_fqdn }}/rabbitmq:alpine"
vid:
- mariadb_image: "{{ server_fqdn }}/mariadb:10"
+ mariadb_image: "{{ server_fqdn }}/library/mariadb:10"
nbi:
mongo:
dockerHubRepository: "{{ server_fqdn }}/registry.hub.docker.com"
diff --git a/scenarios/templates/sdc-profile.yaml.j2 b/scenarios/templates/sdc-profile.yaml.j2
index a8ee771..80fe062 100644
--- a/scenarios/templates/sdc-profile.yaml.j2
+++ b/scenarios/templates/sdc-profile.yaml.j2
@@ -63,9 +63,10 @@
enabled: false
portal:
enabled: true
+platform:
+ enabled: true
robot:
- enabled: false
-
+ enabled: true
sdc:
enabled: true
uui:
diff --git a/scenarios/vars/offline-deployment.yaml b/scenarios/vars/offline-deployment.yaml
index c167bc3..a3330e6 100644
--- a/scenarios/vars/offline-deployment.yaml
+++ b/scenarios/vars/offline-deployment.yaml
@@ -30,9 +30,9 @@
timeout: 45
podlist: "-c so -c sdc-fe"
storagepodlist: "-c cassandra"
- fullwovfc:
+ full:
timeout: 45
- podlist: "-c so -c sdc-fe -c vnfsdk"
+ podlist: "-c so -c sdc-fe -c vid -c dcae-ves-collector"
storagepodlist: "-c cassandra"
# vim: set ts=2 sw=2 expandtab:
diff --git a/vars/onap.yaml b/vars/onap.yaml
index b5c097a..4e9d1cf 100644
--- a/vars/onap.yaml
+++ b/vars/onap.yaml
@@ -30,7 +30,7 @@
# similar to scenarios; they are available in installer repository.
scenarios:
- onap-sdc-nofeature
- - onap-so-nofeature
+ - onap-full-nofeature
- onap-all-nofeature
# NOTE (fdegir): set default deploy scenario for the stack