Update for custom definition, profile, and storage class
* Updated secret name for node and provisioner
* Added variable CUSTOM_DEFINITION to supply custom definition
to be applied while deploying onap.
* Added variable OVERRIDES_PROFILE to override profile while
creating profile for onap components.
* Updated onap_version to 10.0.0 (Jakarta)
Depends-On: Ib5a5f9254ee975948b1c54085731e44ee10b8198
Change-Id: I02dace5a8a89d86aac5473ae60064ff8a9337885
diff --git a/install.sh b/install.sh
index 4ba9ff5..4eca7cd 100755
--- a/install.sh
+++ b/install.sh
@@ -35,6 +35,24 @@
cp "$INVENTORY_INI" "${ENGINE_PATH}/engine/inventory/inventory.ini"
#-------------------------------------------------------------------------------
+# Bootstrap custom definition
+#-------------------------------------------------------------------------------
+if [[ -n ${CUSTOM_DEFINITION+x} ]]; then
+ echo "var is set to '$CUSTOM_DEFINITION'";
+ export CUSTOM_DEFINITION="${CUSTOM_DEFINITION}"
+ cp "$CUSTOM_DEFINITION" "${ENGINE_PATH}/engine/inventory/group_vars/all/custom_definition.yaml"
+fi
+
+#-------------------------------------------------------------------------------
+# Bootstrap custom profile
+#-------------------------------------------------------------------------------
+if [[ -n ${OVERRIDES_PROFILE+x} ]]; then
+ echo "var is set to '$OVERRIDES_PROFILE'";
+ export OVERRIDES_PROFILE=${OVERRIDES_PROFILE}
+ cp "$OVERRIDES_PROFILE" "${ENGINE_PATH}/engine/inventory/group_vars/all/overrides_profile.yaml"
+fi
+
+#-------------------------------------------------------------------------------
# Bootstrap stack software configuration
#-------------------------------------------------------------------------------
echo "Info : Bootstrap stack software configuration"
diff --git a/playbooks/roles/bootstrap-jumphost/templates/filesystem-storageclass.yaml.j2 b/playbooks/roles/bootstrap-jumphost/templates/filesystem-storageclass.yaml.j2
index 87050b0..864de01 100644
--- a/playbooks/roles/bootstrap-jumphost/templates/filesystem-storageclass.yaml.j2
+++ b/playbooks/roles/bootstrap-jumphost/templates/filesystem-storageclass.yaml.j2
@@ -23,9 +23,9 @@
# The secrets contain Ceph admin credentials. These are generated automatically by the operator
# in the same namespace as the cluster.
- csi.storage.k8s.io/node-stage-secret-name: rook-ceph-csi
+ csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node
csi.storage.k8s.io/node-stage-secret-namespace: {{ rook_namespace }}
- csi.storage.k8s.io/provisioner-secret-name: rook-ceph-csi
+ csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner
csi.storage.k8s.io/provisioner-secret-namespace: {{ rook_namespace }}
reclaimPolicy: Delete
diff --git a/scenarios/files/onap-full-nofeature.yaml b/scenarios/files/onap-full-nofeature.yaml
index 1ae737b..9b155d3 100644
--- a/scenarios/files/onap-full-nofeature.yaml
+++ b/scenarios/files/onap-full-nofeature.yaml
@@ -20,5 +20,5 @@
profilecheck:
timeout: 45
podlist: "-c sdc-fe -c sdnc"
- storagepodlist: "-c cassandra"
+ storagepodlist: "-c cassandra -c mariadb-galera"
# vim: set ts=2 sw=2 expandtab:
diff --git a/scenarios/onap-full-nofeature.yaml b/scenarios/onap-full-nofeature.yaml
index 60f8b1c..23fdd78 100644
--- a/scenarios/onap-full-nofeature.yaml
+++ b/scenarios/onap-full-nofeature.yaml
@@ -32,6 +32,18 @@
dest: "{{ engine_path }}/engine/inventory/group_vars/all/{{ deploy_scenario }}.yaml"
force: true
+ # Check if the custom definition is provided
+ - name: Check if custom definition file exists in group_vars
+ stat:
+ path: "{{ engine_path }}/engine/inventory/group_vars/all/custom_definition.yaml"
+ register: custom_definition
+
+ # Check if the override profile is provided
+ - name: Check if override profile file exists in group_vars
+ stat:
+ path: "{{ engine_path }}/engine/inventory/group_vars/all/overrides_profile.yaml"
+ register: overrides_profile
+
- hosts: jumphost
gather_facts: true
@@ -48,12 +60,29 @@
state: directory
mode: '0755'
+ # If custom_definition file exit copy it to /apps/onap
+ - name: Creating custom custom definition
+ template:
+ src: "{{ engine_path }}/engine/inventory/group_vars/all/custom_definition.yaml"
+ dest: "{{ config_path }}/apps/onap/custom_definition.yaml"
+ force: true
+ when: hostvars['localhost']['custom_definition'].stat.exists
+
+ # If override profile file exit copy it to /apps/onap
+ - name: Creating overrides profile file
+ template:
+ src: "{{ engine_path }}/engine/inventory/group_vars/all/overrides_profile.yaml"
+ dest: "{{ config_path }}/apps/onap/profile.yaml"
+ force: true
+ when: hostvars['localhost']['overrides_profile'].stat.exists
+
# 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
+ when: not hostvars['localhost']['overrides_profile'].stat.exists
# Profile file countains override.yaml for ONAP helm charts to specify what is installed
- name: Create profile file for storage
@@ -75,7 +104,6 @@
dest: "{{ config_path }}/apps/onap/repos.yaml"
force: true
-
# NOTE (fdegir): common postinstall tasks
- hosts: localhost
connection: local
diff --git a/scenarios/templates/full-profile.yaml.j2 b/scenarios/templates/full-profile.yaml.j2
index 04b9f34..976fc26 100644
--- a/scenarios/templates/full-profile.yaml.j2
+++ b/scenarios/templates/full-profile.yaml.j2
@@ -2,6 +2,7 @@
repository: "{{ onap_image_repository }}"
pullPolicy: IfNotPresent
masterPassword: "{{ onap_masterpassword }}"
+ passwordStrength: basic
addTestingComponents: &testing true
so:
diff --git a/scenarios/templates/sdc-profile-storage.yaml.j2 b/scenarios/templates/sdc-profile-storage.yaml.j2
index d308009..732a516 100644
--- a/scenarios/templates/sdc-profile-storage.yaml.j2
+++ b/scenarios/templates/sdc-profile-storage.yaml.j2
@@ -2,9 +2,13 @@
repository: "{{ onap_image_repository }}"
pullPolicy: IfNotPresent
masterPassword: "{{ onap_masterpassword }}"
+ passwordStrength: basic
cassandra:
enabled: true
resources:
limits:
cpu: 2
+mariadb-galera:
+ enabled: true
+ flavor: large
diff --git a/vars/onap.yaml b/vars/onap.yaml
index dfff4c7..5d52e73 100644
--- a/vars/onap.yaml
+++ b/vars/onap.yaml
@@ -54,7 +54,7 @@
containerd_io_version: "1.2.13-2"
profilename: "{{ lookup('env', 'ONAP_PROFILE') | default('sdc', true) }}"
-onap_version: "{{ lookup('env', 'ONAP_VERSION') | default('9.0.0+latest', true) }}"
+onap_version: "{{ lookup('env', 'ONAP_VERSION') | default('10.0.0+latest', true) }}"
chartmuseum_version: "v0.13.1"
chartmuseum_download_url: "https://get.helm.sh/chartmuseum-{{ chartmuseum_version }}-linux-amd64.tar.gz"