diff --git a/OCNE/scripts/provision.sh b/OCNE/scripts/provision.sh index c424509b..752e49a1 100755 --- a/OCNE/scripts/provision.sh +++ b/OCNE/scripts/provision.sh @@ -362,10 +362,8 @@ install_packages() { ### `nft_masq` is not part of kernel-uek-core since OL8U7. To enable masquerading, we must install kernel-uek-modules ### https://docs.oracle.com/en/operating-systems/uek/7/relnotes7.0/uek7.0-NewFeaturesandChanges.html - if ! [[ ${POD_NETWORK} == "calico" || ${DEPLOY_CALICO} == 1 ]]; then - msg "Installing kernel-uek-modules" - echo_do sudo dnf install -y kernel-uek-modules-$(uname -r) - fi + msg "Installing kernel-uek-modules" + echo_do sudo dnf install -y kernel-uek-modules-$(uname -r) msg "Installing the OpenSSL toolkit" echo_do sudo dnf install -y openssl ### @@ -375,9 +373,7 @@ install_packages() { echo_do sudo dnf install -y olcnectl"${OCNE_VERSION}" olcne-api-server"${OCNE_VERSION}" olcne-utils"${OCNE_VERSION}" echo_do sudo systemctl enable olcne-api-server.service echo_do sudo firewall-cmd --add-port=8091/tcp --permanent - if ! [[ ${POD_NETWORK} == "calico" || ${DEPLOY_CALICO} == 1 ]]; then - echo_do sudo firewall-cmd --add-masquerade --permanent - fi + echo_do sudo firewall-cmd --add-masquerade --permanent fi if [[ ${MASTER} == 1 || ${WORKER} == 1 ]]; then msg "Installing the Oracle Cloud Native Environment Platform Agent" @@ -489,12 +485,12 @@ install_packages() { fi fi - if ! [[ ${POD_NETWORK} == "calico" || ${DEPLOY_CALICO} == 1 ]]; then - # Reload firewalld - echo_do sudo firewall-cmd --reload - else + if [[ ${POD_NETWORK} == "calico" || ${DEPLOY_CALICO} == 1 ]]; then msg "Disable firewalld.service as required by Calico networking" echo_do sudo systemctl disable --now firewalld.service + else + # Reload firewalld + echo_do sudo firewall-cmd --reload fi } @@ -783,8 +779,7 @@ deploy_modules() { --module istio \ --name "${ISTIO_MODULE_NAME}" \ --istio-container-registry "${REGISTRY_OCNE}" \ - --istio-helm-module "${HELM_MODULE_NAME}" - + --istio-kubernetes-module "${OCNE_CLUSTER_NAME}" # Validate the Istio module msg "Validating the Istio module: ${ISTIO_MODULE_NAME}" @@ -817,7 +812,7 @@ deploy_modules() { --environment-name "${OCNE_ENV_NAME}" \ --module metallb \ --name "${METALLB_MODULE_NAME}" \ - --metallb-helm-module "${HELM_MODULE_NAME}" \ + --metallb-kubernetes-module "${OCNE_CLUSTER_NAME}" \ --metallb-config /vagrant/metallb-config.yaml msg "Removing MetalLB temporary configuration file" @@ -851,7 +846,7 @@ deploy_modules() { --environment-name "${OCNE_ENV_NAME}" \ --module gluster \ --name "${GLUSTER_MODULE_NAME}" \ - --gluster-helm-module "${HELM_MODULE_NAME}" \ + --gluster-kubernetes-module "${OCNE_CLUSTER_NAME}" \ --gluster-server-url "${HEKETI_CLI_SERVER}" # Validate the Gluster module diff --git a/Ocr-Yum-Mirror/Vagrantfile b/Ocr-Yum-Mirror/Vagrantfile index 4697a706..517dea08 100644 --- a/Ocr-Yum-Mirror/Vagrantfile +++ b/Ocr-Yum-Mirror/Vagrantfile @@ -46,18 +46,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # change memory size config.vm.provider "virtualbox" do |v| - v.memory = 2048 + v.memory = 1024 v.name = NAME - # add second disk device + # add second disk device file_to_disk = File.realpath( "." ).to_s + "/disk.vdi" - if ARGV[0] == "up" && ! File.exist?(file_to_disk) - v.customize [ - 'createhd', - '--filename', file_to_disk, - '--format', 'VDI', - '--size', 50 * 1024 # 50 GB - ] + if ARGV[0] == "up" + if ! File.exist?(file_to_disk) + v.customize [ + 'createhd', + '--filename', file_to_disk, + '--format', 'VDI', + '--size', 50 * 1024 # 50 GB + ] + end v.customize [ 'storageattach', :id, '--storagectl', 'SATA Controller', # The name may vary @@ -126,8 +128,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.provision "shell", path: "scripts/ocr-mirror.sh", privileged: false # Share Yum mirror and OCNE mirror access - config.vm.provision "shell", inline: "echo 'INSTALLER: Oracle Linux Yum Mirror is available at http://:8080/yum/'", privileged: false - config.vm.provision "shell", inline: "echo 'INSTALLER: Oracle Container Registry Mirror is available at https://:5000/olcne/'", privileged: false - config.vm.provision "shell", inline: "echo 'INSTALLER: Installation complete, Oracle Linux 8 ready to use!'", privileged: false + config.vm.post_up_message = <<-MSG + Installation complete, Oracle Linux 8 mirror ready to use! + + ----------------------------------------------------------- + Local Ocr-Yum-Mirror, accessible via: + 127.0.0.1 (localhost); or + 10.0.2.2 (inside VirtualBox VMs) + + URLs: + - OracleLinux8 Yum Repo - http://localhost:8080/yum/ + - OCNE 1.6 Docker Registry - https://localhost:5000/olcne/ + + ----------------------------------------------------------- + MSG end diff --git a/Ocr-Yum-Mirror/scripts/install.sh b/Ocr-Yum-Mirror/scripts/install.sh index 004b3479..93ffb2ae 100644 --- a/Ocr-Yum-Mirror/scripts/install.sh +++ b/Ocr-Yum-Mirror/scripts/install.sh @@ -31,9 +31,11 @@ EOF echo 'INSTALLER: Locale set' echo 'INSTALLER: Creating persistent virtual-disk /dev/sdb1' -# persistent disk -printf "o\nn\np\n1\n\n\nw\n" |sudo fdisk /dev/sdb -sudo mkfs.xfs /dev/sdb1 +# persistent disk. check if xfs fs already exists +if ! sudo blkid /dev/sdb1 | grep -q "TYPE=\"xfs\""; then + printf "o\nn\np\n1\n\n\nw\n" |sudo fdisk /dev/sdb + sudo mkfs.xfs /dev/sdb1 +fi sudo mkdir -p /var/yum sudo mount /dev/sdb1 /var/yum sudo chown vagrant: /var/yum diff --git a/Ocr-Yum-Mirror/scripts/ocr-mirror.sh b/Ocr-Yum-Mirror/scripts/ocr-mirror.sh index 3ee7b667..59522fbc 100644 --- a/Ocr-Yum-Mirror/scripts/ocr-mirror.sh +++ b/Ocr-Yum-Mirror/scripts/ocr-mirror.sh @@ -49,11 +49,11 @@ podman run -d -p 5000:5000 --name ocr-yum-mirror --restart=always \ # add sync script for OCR mirror cat <