From 5497673a7b5a7c07d3e99d77d028447acbdd36a5 Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Wed, 12 Jul 2017 15:18:48 -0400 Subject: image builds: remove dependency on playbook2image We do not need the builder functionality from playbook2image and the resulting image was overly complicated, so this simply builds on Centos/RHEL. --- images/installer/system-container/README.md | 31 --- .../root/exports/config.json.template | 234 --------------------- .../system-container/root/exports/manifest.json | 12 -- .../system-container/root/exports/service.template | 6 - .../root/exports/tmpfiles.template | 2 - .../root/usr/local/bin/run-system-container.sh | 4 - 6 files changed, 289 deletions(-) delete mode 100644 images/installer/system-container/README.md delete mode 100644 images/installer/system-container/root/exports/config.json.template delete mode 100644 images/installer/system-container/root/exports/manifest.json delete mode 100644 images/installer/system-container/root/exports/service.template delete mode 100644 images/installer/system-container/root/exports/tmpfiles.template delete mode 100755 images/installer/system-container/root/usr/local/bin/run-system-container.sh (limited to 'images/installer/system-container') diff --git a/images/installer/system-container/README.md b/images/installer/system-container/README.md deleted file mode 100644 index fbcd47c4a..000000000 --- a/images/installer/system-container/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# System container installer - -These files are needed to run the installer using an [Atomic System container](http://www.projectatomic.io/blog/2016/09/intro-to-system-containers/). - -* config.json.template - Template of the configuration file used for running containers. - -* manifest.json - Used to define various settings for the system container, such as the default values to use for the installation. - -* run-system-container.sh - Entrypoint to the container. - -* service.template - Template file for the systemd service. - -* tmpfiles.template - Template file for systemd-tmpfiles. - -## Options - -These options may be set via the ``atomic`` ``--set`` flag. For defaults see ``root/exports/manifest.json`` - -* OPTS - Additional options to pass to ansible when running the installer - -* VAR_LIB_OPENSHIFT_INSTALLER - Full path of the installer code to mount into the container - -* VAR_LOG_OPENSHIFT_LOG - Full path of the log file to mount into the container - -* PLAYBOOK_FILE - Full path of the playbook inside the container - -* HOME_ROOT - Full path on host to mount as the root home directory inside the container (for .ssh/, etc..) - -* ANSIBLE_CONFIG - Full path for the ansible configuration file to use inside the container - -* INVENTORY_FILE - Full path for the inventory to use from the host diff --git a/images/installer/system-container/root/exports/config.json.template b/images/installer/system-container/root/exports/config.json.template deleted file mode 100644 index 739c0080f..000000000 --- a/images/installer/system-container/root/exports/config.json.template +++ /dev/null @@ -1,234 +0,0 @@ -{ - "ociVersion": "1.0.0", - "platform": { - "os": "linux", - "arch": "amd64" - }, - "process": { - "terminal": false, - "consoleSize": { - "height": 0, - "width": 0 - }, - "user": { - "uid": 0, - "gid": 0 - }, - "args": [ - "/usr/local/bin/run-system-container.sh" - ], - "env": [ - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", - "TERM=xterm", - "OPTS=$OPTS", - "PLAYBOOK_FILE=$PLAYBOOK_FILE", - "ANSIBLE_CONFIG=$ANSIBLE_CONFIG" - ], - "cwd": "/opt/app-root/src/", - "rlimits": [ - { - "type": "RLIMIT_NOFILE", - "hard": 1024, - "soft": 1024 - } - ], - "noNewPrivileges": true - }, - "root": { - "path": "rootfs", - "readonly": true - }, - "mounts": [ - { - "destination": "/proc", - "type": "proc", - "source": "proc" - }, - { - "destination": "/dev", - "type": "tmpfs", - "source": "tmpfs", - "options": [ - "nosuid", - "strictatime", - "mode=755", - "size=65536k" - ] - }, - { - "destination": "/dev/pts", - "type": "devpts", - "source": "devpts", - "options": [ - "nosuid", - "noexec", - "newinstance", - "ptmxmode=0666", - "mode=0620", - "gid=5" - ] - }, - { - "destination": "/dev/shm", - "type": "tmpfs", - "source": "shm", - "options": [ - "nosuid", - "noexec", - "nodev", - "mode=1777", - "size=65536k" - ] - }, - { - "destination": "/dev/mqueue", - "type": "mqueue", - "source": "mqueue", - "options": [ - "nosuid", - "noexec", - "nodev" - ] - }, - { - "destination": "/sys", - "type": "sysfs", - "source": "sysfs", - "options": [ - "nosuid", - "noexec", - "nodev", - "ro" - ] - }, - { - "type": "bind", - "source": "$HOME_ROOT/.ssh", - "destination": "/opt/app-root/src/.ssh", - "options": [ - "bind", - "rw", - "mode=755" - ] - }, - { - "type": "bind", - "source": "$HOME_ROOT", - "destination": "/root", - "options": [ - "bind", - "rw", - "mode=755" - ] - }, - { - "type": "bind", - "source": "$VAR_LIB_OPENSHIFT_INSTALLER", - "destination": "/var/lib/openshift-installer", - "options": [ - "bind", - "rw", - "mode=755" - ] - }, - { - "type": "bind", - "source": "$VAR_LOG_OPENSHIFT_LOG", - "destination": "/var/log/ansible.log", - "options": [ - "bind", - "rw", - "mode=755" - ] - }, - { - "destination": "/root/.ansible", - "type": "tmpfs", - "source": "tmpfs", - "options": [ - "nosuid", - "strictatime", - "mode=755" - ] - }, - { - "destination": "/tmp", - "type": "tmpfs", - "source": "tmpfs", - "options": [ - "nosuid", - "strictatime", - "mode=755" - ] - }, - { - "type": "bind", - "source": "$INVENTORY_FILE", - "destination": "/etc/ansible/hosts", - "options": [ - "bind", - "rw", - "mode=755" - ] - }, - { - "destination": "/etc/resolv.conf", - "type": "bind", - "source": "/etc/resolv.conf", - "options": [ - "ro", - "rbind", - "rprivate" - ] - }, - { - "destination": "/sys/fs/cgroup", - "type": "cgroup", - "source": "cgroup", - "options": [ - "nosuid", - "noexec", - "nodev", - "relatime", - "ro" - ] - } - ], - "hooks": { - - }, - "linux": { - "resources": { - "devices": [ - { - "allow": false, - "access": "rwm" - } - ] - }, - "namespaces": [ - { - "type": "pid" - }, - { - "type": "mount" - } - ], - "maskedPaths": [ - "/proc/kcore", - "/proc/latency_stats", - "/proc/timer_list", - "/proc/timer_stats", - "/proc/sched_debug", - "/sys/firmware" - ], - "readonlyPaths": [ - "/proc/asound", - "/proc/bus", - "/proc/fs", - "/proc/irq", - "/proc/sys", - "/proc/sysrq-trigger" - ] - } -} diff --git a/images/installer/system-container/root/exports/manifest.json b/images/installer/system-container/root/exports/manifest.json deleted file mode 100644 index 8b984d7a3..000000000 --- a/images/installer/system-container/root/exports/manifest.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": "1.0", - "defaultValues": { - "OPTS": "", - "VAR_LIB_OPENSHIFT_INSTALLER" : "/var/lib/openshift-installer", - "VAR_LOG_OPENSHIFT_LOG": "/var/log/ansible.log", - "PLAYBOOK_FILE": "/usr/share/ansible/openshift-ansible/playbooks/byo/config.yml", - "HOME_ROOT": "/root", - "ANSIBLE_CONFIG": "/usr/share/atomic-openshift-utils/ansible.cfg", - "INVENTORY_FILE": "/dev/null" - } -} diff --git a/images/installer/system-container/root/exports/service.template b/images/installer/system-container/root/exports/service.template deleted file mode 100644 index bf5316af6..000000000 --- a/images/installer/system-container/root/exports/service.template +++ /dev/null @@ -1,6 +0,0 @@ -[Service] -ExecStart=$EXEC_START -ExecStop=-$EXEC_STOP -Restart=no -WorkingDirectory=$DESTDIR -Type=oneshot diff --git a/images/installer/system-container/root/exports/tmpfiles.template b/images/installer/system-container/root/exports/tmpfiles.template deleted file mode 100644 index b1f6caf47..000000000 --- a/images/installer/system-container/root/exports/tmpfiles.template +++ /dev/null @@ -1,2 +0,0 @@ -d $VAR_LIB_OPENSHIFT_INSTALLER - - - - - -f $VAR_LOG_OPENSHIFT_LOG - - - - - diff --git a/images/installer/system-container/root/usr/local/bin/run-system-container.sh b/images/installer/system-container/root/usr/local/bin/run-system-container.sh deleted file mode 100755 index 9ce7c7328..000000000 --- a/images/installer/system-container/root/usr/local/bin/run-system-container.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -export ANSIBLE_LOG_PATH=/var/log/ansible.log -exec ansible-playbook -i /etc/ansible/hosts ${OPTS} ${PLAYBOOK_FILE} -- cgit v1.2.3