[TryMOS] Rearrange installation folder structure in the image
Related-Prod: PRODX-53425
Change-Id: I1f51b2ff3b215152d1f12ad062f8b1f0fc8a9668
diff --git a/trymos/image_build/ansible/ansible.cfg b/trymos/image_build/ansible/ansible.cfg
index 1c7972d..1642a6f 100644
--- a/trymos/image_build/ansible/ansible.cfg
+++ b/trymos/image_build/ansible/ansible.cfg
@@ -1,2 +1,2 @@
[defaults]
-roles_path=/srv/ansible/roles:/srv/virtual_lab/ansible/roles:/root/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles:/srv/ansible
\ No newline at end of file
+roles_path=/srv/trymosk/rockoon/virtual_lab/ansible/roles:/root/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles:/srv/ansible
diff --git a/trymos/image_build/ansible/inventory/master/single_node.yaml b/trymos/image_build/ansible/inventory/master/single_node.yaml
deleted file mode 100644
index ba809ed..0000000
--- a/trymos/image_build/ansible/inventory/master/single_node.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-all:
- vars:
- ansible_ssh_user: ubuntu
- k0s_worker_on_controller: true
- k0s_no_taints: true
- k0s_version: 1.31.8+k0s.0
- ansible_ssh_common_args: '-o StrictHostKeyChecking=no'
- kubeconfig: "{{ inventory_dir }}/artifacts/k0s-kubeconfig.yml"
- rvl_images_build_rockoon: false
- rvl_images_build_loci: false
- rvl_registry_source: systemd
- rvl_mirror_images: true
- rvl_mirror_charts: true
- rvl_mirror_binaries: true
- rvl_images_build_tag: 1.1.6-dev9
- rvl_images_base_url: "{{ rvl_registry_host }}"
- rvl_binary_base_url: "{{ rvl_registry_https_url }}"
- rvl_chart_ref_rockoon: "{{ rvl_registry_https_url }}/openstack/helm/rockoon/rockoon-1.1.6-dev9.tgz"
- rvl_mirror_rockoon_chart: "{{ rvl_binary_public_base_url }}/openstack/helm/rockoon/rockoon-1.1.6-dev9.tgz"
- rvl_openvpn_enable: true
-
- hosts:
- oc-virtual-lab-server-ctl-01:
- ansible_host: localhost
- ansible_connection: local
-
- children:
- computes:
- hosts:
- oc-virtual-lab-server-ctl-01:
- controllers:
- hosts:
- oc-virtual-lab-server-ctl-01:
- k8s_controllers:
- hosts:
- oc-virtual-lab-server-ctl-01:
- k8s_workers:
- hosts:
diff --git a/trymos/image_build/ansible/inventory/mosk-25.1/single_node.yaml b/trymos/image_build/ansible/inventory/mosk-25.1/single_node.yaml
deleted file mode 100644
index 008adab..0000000
--- a/trymos/image_build/ansible/inventory/mosk-25.1/single_node.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-all:
- vars:
- ansible_ssh_user: ubuntu
- k0s_worker_on_controller: true
- k0s_no_taints: true
- k0s_version: 1.27.16+k0s.0
- ansible_ssh_common_args: '-o StrictHostKeyChecking=no'
- kubeconfig: "{{ inventory_dir }}/artifacts/k0s-kubeconfig.yml"
- rvl_images_build_rockoon: false
- rvl_images_build_loci: false
- rvl_registry_source: systemd
- rvl_mirror_images: true
- rvl_mirror_charts: true
- rvl_mirror_binaries: true
- rvl_images_build_tag: 1.0.7
- rvl_binary_public_base_url: https://binary.mirantis.com
- rvl_images_public_base_url: mirantis.azurecr.io
- rvl_images_base_url: "{{ rvl_registry_host }}"
- rvl_binary_base_url: "{{ rvl_registry_https_url }}"
- rvl_chart_ref_rockoon: "{{ rvl_registry_https_url }}/openstack/helm/rockoon/rockoon-1.0.7.tgz"
- rvl_mirror_rockoon_chart: "{{ rvl_binary_public_base_url }}/openstack/helm/rockoon/rockoon-1.0.7.tgz"
- rvl_openvpn_enable: true
-
- hosts:
- oc-virtual-lab-server-ctl-01:
- ansible_host: localhost
- ansible_connection: local
-
- children:
- computes:
- hosts:
- oc-virtual-lab-server-ctl-01:
- controllers:
- hosts:
- oc-virtual-lab-server-ctl-01:
- k8s_controllers:
- hosts:
- oc-virtual-lab-server-ctl-01:
- k8s_workers:
- hosts:
diff --git a/trymos/image_build/build_image.sh b/trymos/image_build/build_image.sh
index a66aad1..b85db84 100755
--- a/trymos/image_build/build_image.sh
+++ b/trymos/image_build/build_image.sh
@@ -5,7 +5,7 @@
source env/${ENVIRONMENT}/packer.env
-export VM_NAME=${VM_NAME:-"trymos-amd64-${ENVIRONMENT}-$(date +"%Y%m%d%H%M%S").qcow2"}
+export VM_NAME=${VM_NAME:-"trymosk-amd64-${ENVIRONMENT}-$(date +"%Y%m%d%H%M%S").qcow2"}
export PACKER_LOG=${PACKER_LOG:-"1"}
export PACKER_IMAGES_CACHE=${PACKER_IMAGES_CACHE:-"./packer_images_cache"}
diff --git a/trymos/image_build/env/master/packer.env b/trymos/image_build/env/master/packer.env
index 45dfc86..6dac626 100644
--- a/trymos/image_build/env/master/packer.env
+++ b/trymos/image_build/env/master/packer.env
@@ -1,3 +1,2 @@
export IMAGE_BASE_URL=${IMAGE_BASE_URL:-"https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"}
export IMAGE_MD5_URL=${IMAGE_MD5_URL:-"https://cloud-images.ubuntu.com/jammy/current/MD5SUMS"}
-export INVENTORY_FILE=${INVENTORY_FILE:-"./ansible/inventory/master/single_node.yaml"}
diff --git a/trymos/image_build/env/mosk-25.1/packer.env b/trymos/image_build/env/mosk-25.1/packer.env
index cb1a09e..6dac626 100644
--- a/trymos/image_build/env/mosk-25.1/packer.env
+++ b/trymos/image_build/env/mosk-25.1/packer.env
@@ -1,3 +1,2 @@
export IMAGE_BASE_URL=${IMAGE_BASE_URL:-"https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"}
export IMAGE_MD5_URL=${IMAGE_MD5_URL:-"https://cloud-images.ubuntu.com/jammy/current/MD5SUMS"}
-export INVENTORY_FILE=${INVENTORY_FILE:-"./ansible/inventory/mosk-25.1/single_node.yaml"}
diff --git a/trymos/image_build/scripts/build-image.sh b/trymos/image_build/scripts/build-image.sh
index c7140ad..28acd66 100755
--- a/trymos/image_build/scripts/build-image.sh
+++ b/trymos/image_build/scripts/build-image.sh
@@ -21,7 +21,7 @@
ansible-galaxy role install cloudalchemy.coredns
TOP_DIR="$(cd "$(dirname "$0")" && pwd)"
-INVENTORY_FILE=${INVENTORY_FILE:-"${TOP_DIR}/../single_node.yaml"}
+INVENTORY_FILE="${TOP_DIR}/../rockoon/virtual_lab/ansible/inventory/trymosk_single_node.yaml"
PRE_INSTALL_INVENTORY=/tmp/pre_install.yaml
HOSTNAME=$(hostname)
diff --git a/trymos/image_build/scripts/install-trymos.sh b/trymos/image_build/scripts/install-trymos.sh
deleted file mode 100755
index 6883b75..0000000
--- a/trymos/image_build/scripts/install-trymos.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-LOG_FILE=${LOG_FILE:-"/var/log/trymos-install.log"}
-
-exec > >(ts '[%Y-%m-%d %H:%M:%S]' | tee -a "${LOG_FILE}" )
-exec 2> >(ts '[%Y-%m-%d %H:%M:%S]' | tee -a "${LOG_FILE}" >&2)
-
-HOSTNAME=$(hostname)
-TOP_DIR="$(cd "$(dirname "$0")" && pwd)"
-INVENTORY_FILE=${INVENTORY_FILE:-"${TOP_DIR}/../single_node.yaml"}
-
-sed -i "s/oc-virtual-lab-server-ctl-01/${HOSTNAME}/g" "${INVENTORY_FILE}"
-
-cd ${TOP_DIR}/../virtual_lab/ansible
-apt update -y
-
-ansible-playbook -i "${INVENTORY_FILE}" k0s-install.yaml -vvv
-
-mkdir -p /root/.kube; cp "$(dirname "${INVENTORY_FILE}")/artifacts/k0s-kubeconfig.yml" /root/.kube/config
-
-ansible-playbook -i "${INVENTORY_FILE}" infra-install.yaml -vvv
-ansible-playbook -i "${INVENTORY_FILE}" oc-install.yaml -vvv
-ansible-playbook -i "${INVENTORY_FILE}" oc-install.yaml -vvv --tags wait
-ansible-playbook -i "${INVENTORY_FILE}" deployment-info.yaml
diff --git a/trymos/image_build/scripts/launch.sh b/trymos/image_build/scripts/launch.sh
index 368d963..8fe7704 100755
--- a/trymos/image_build/scripts/launch.sh
+++ b/trymos/image_build/scripts/launch.sh
@@ -2,6 +2,7 @@
set -ex
-export INVENTORY_FILE=/srv/single_node.yaml
+export INVENTORY_FILE=/srv/trymosk/rockoon/virtual_lab/ansible/inventory/trymosk_single_node.yaml
+export LOG_FILE=/var/log/trymosk-install.log
-/srv/trymos/install-trymos.sh
+/srv/trymosk/rockoon/virtual_lab/install.sh
diff --git a/trymos/image_build/template.json b/trymos/image_build/template.json
index cc8e575..db18625 100644
--- a/trymos/image_build/template.json
+++ b/trymos/image_build/template.json
@@ -6,50 +6,40 @@
"images_cache": "{{ env `PACKER_IMAGES_CACHE` }}",
"image_base_url": "{{ env `IMAGE_BASE_URL` }}",
"image_md5_url": "{{ env `IMAGE_MD5_URL` }}",
- "vm_name": "{{ env `VM_NAME` }}",
- "inventory_file": "{{ env `INVENTORY_FILE` }}"
+ "vm_name": "{{ env `VM_NAME` }}"
},
"provisioners": [
{
"type": "shell",
"inline": [
- "mkdir -p /usr/share/trymos /srv/trymos"
+ "mkdir -p /srv/trymosk/image_build"
]
},
{
"type": "file",
- "source": "{{user `inventory_file`}}",
- "destination": "/srv/single_node.yaml"
- },
- {
- "type": "file",
"sources": [
- "../rockoon/charts",
- "../rockoon/virtual_lab"
+ "../rockoon"
],
- "destination": "/srv/"
- },
- {
- "type": "file",
- "source": "./scripts/launch.sh",
- "destination": "/usr/share/trymos/"
+ "destination": "/srv/trymosk/"
},
{
"type": "file",
"sources": [
"./ansible",
- "./scripts/build-image.sh",
- "./scripts/install-trymos.sh"
+ "./scripts/build-image.sh"
],
- "destination": "/srv/trymos/"
+ "destination": "/srv/trymosk/image_build/"
+ },
+ {
+ "type": "file",
+ "source": "./scripts/launch.sh",
+ "destination": "/srv/trymosk/"
},
{
"type": "shell",
- "environment_vars": [
- "INVENTORY_FILE=/srv/single_node.yaml"
- ],
"inline": [
- "/srv/trymos/build-image.sh"
+ "/srv/trymosk/image_build/build-image.sh",
+ "rm -rf /srv/trymosk/image_build"
]
}
],