Update persistence.yaml and offline-deployment-repos
Later versions of OOM require modifications to repos.yaml in order to
pull images correctly in offline deployment mode.
Additionally, a number of storageclasses request RWX block storage.
This is not allowed by Rook/Ceph, so changing storageclass to
csi-cephfs where required.
Change-Id: I693bb9b0883552df353e5e586eac700f7643d751
Signed-off-by: Cian Johnston <cian.johnston@est.tech>
diff --git a/scenarios/templates/offline-deployment-persistence.yaml.j2 b/scenarios/templates/offline-deployment-persistence.yaml.j2
index da978e1..7755d1d 100644
--- a/scenarios/templates/offline-deployment-persistence.yaml.j2
+++ b/scenarios/templates/offline-deployment-persistence.yaml.j2
@@ -318,7 +318,8 @@
storageClass: "{{ storage_classname }}"
robot:
persistence:
- storageClass: "{{ storage_classname }}"
+ storageClass: "{{ storage_filesystem_classname }}"
+ accessMode: ReadWriteMany
sdc:
persistence:
storageClass: "{{ storage_classname }}"
@@ -327,10 +328,13 @@
storageClass: "{{ storage_classname }}"
sdc-onboarding-be:
persistence:
- storageClass: "{{ storage_classname }}"
+ storageClass: "{{ storage_filesystem_classname }}"
+ accessMode: ReadWriteMany
cert:
persistence:
size: 50M
+ storageClass: "{{ storage_filesystem_classname }}"
+ accessMode: ReadWriteMany
sdnc:
dmaap-listener:
diff --git a/scenarios/templates/offline-deployment-repos.yaml b/scenarios/templates/offline-deployment-repos.yaml
index 5dd610e..1041f5d 100644
--- a/scenarios/templates/offline-deployment-repos.yaml
+++ b/scenarios/templates/offline-deployment-repos.yaml
@@ -27,21 +27,23 @@
consulLoaderRepository: "{{ server_fqdn }}"
dockerHubRepository: "{{ server_fqdn }}"
dockerhubRepository: "{{ server_fqdn }}"
+ googleK8sRepository: "{{ server_fqdn }}"
elasticdumpRepository: "{{ server_fqdn }}"
imageRepository: "{{ server_fqdn }}"
loggingRepository: "{{ server_fqdn }}/docker.elastic.co"
+ elasticRepository: "{{ server_fqdn }}/docker.elastic.co"
postgresRepository: "{{ server_fqdn }}/crunchydata"
readinessRepository: "{{ server_fqdn }}/oomk8s"
tlsRepository: "{{ server_fqdn }}"
ubuntuInitRepository: "{{ server_fqdn }}/oomk8s"
- envsubstImage: "{{ server_fqdn }}/dibi/envsubst"
+ envsubstImage: "dibi/envsubst:1" # repositoryGenerator prepends repository
kubectlImage: "engine.local/bitnami/kubectl:1.15"
aaf:
aaf-sms:
aaf-sms-vault:
image:
- consul: library/consul:1.7.1
- vault: library/vault:1.3.3
+ consul: "consul:1.7.1" # repositoryGenerator prepends repository
+ vault: "vault:1.3.3" # repositoryGenerator prepends repository
policy:
mariadb_image: "{{ server_fqdn }}/library/mariadb:10"
sdnc:
@@ -109,7 +111,7 @@
storageClass: "block-storage"
dcae-bootstrap:
mongo:
- dockerHubRepository: "{{ server_fqdn }}/registry.hub.docker.com"
+ image: "mongo:4.0.8"
postgres:
repository: "{{ server_fqdn }}/crunchydata"
postgresRepository: "{{ server_fqdn }}/crunchydata"
@@ -147,6 +149,9 @@
postgresRepository: "{{ server_fqdn }}/crunchydata"
persistence:
storageClass: "block-storage"
+msb:
+ msb-consul:
+ image: "consul:1.4.3"
multicloud:
multicloud-k8s:
etcd:
@@ -154,11 +159,11 @@
persistence:
storageClass: "block-storage"
mongo:
- dockerHubRepository: "{{ server_fqdn }}/registry.hub.docker.com"
+ image: "mongo:4.0.8"
multicloud-fcaps:
- rabbitmq: "{{ server_fqdn }}/rabbitmq:alpine"
+ rabbitmq: "rabbitmq:alpine"
vid:
mariadb_image: "{{ server_fqdn }}/library/mariadb:10"
nbi:
mongo:
- dockerHubRepository: "{{ server_fqdn }}/registry.hub.docker.com"
+ image: "mongo:4.0.8"
diff --git a/scenarios/templates/online-deployment-persistence.yaml.j2 b/scenarios/templates/online-deployment-persistence.yaml.j2
index 553fc5a..812104e 100644
--- a/scenarios/templates/online-deployment-persistence.yaml.j2
+++ b/scenarios/templates/online-deployment-persistence.yaml.j2
@@ -10,7 +10,7 @@
aaf-sms-quorumclient:
persistence:
size: 50Mi
- storageClass: "{{ storage_classname }}"
+ storageClass: "{{ storage_filesystem_classname }}"
aaf-sms-vault:
persistence:
storageClass: "{{ storage_classname }}"
@@ -67,7 +67,8 @@
cds:
cds-blueprints-processor:
persistence:
- storageClass: "{{ storage_classname }}"
+ storageClass: "{{ storage_filesystem_classname }}"
+
cds-command-executor:
persistence:
storageClass: "{{ storage_classname }}"
@@ -275,7 +276,8 @@
storageClass: "{{ storage_classname }}"
robot:
persistence:
- storageClass: "{{ storage_classname }}"
+ storageClass: "{{ storage_filesystem_classname }}"
+ accessMode: ReadWriteMany
sdc:
persistence:
storageClass: "{{ storage_classname }}"
@@ -284,10 +286,13 @@
storageClass: "{{ storage_classname }}"
sdc-onboarding-be:
persistence:
- storageClass: "{{ storage_classname }}"
+ storageClass: "{{ storage_filesystem_classname }}"
+ accessMode: ReadWriteMany
cert:
persistence:
size: 50M
+ storageClass: "{{ storage_filesystem_classname }}"
+ accessMode: ReadWriteMany
sdnc:
dmaap-listener: