Clean up no longer relevant artifacts
Remove no longer relevant docker and live directories. If we ever want to revisit these approaches, we can look at their history in git. Also clean up old README's as well and drive everything towards the sphinx documentation. Change-Id: Ib0fbd26316d258ab4c8fee48b5d0bab1b5385e29
This commit is contained in:
James Slagle
parent
9c2462c222
commit
bc6c988ae3
|
|
@ -1,71 +0,0 @@
|
|||
The NODES_JSON file specified in the deploy-overcloudrc file should be in the
|
||||
following format:
|
||||
|
||||
For virt:
|
||||
|
||||
{
|
||||
"nodes":
|
||||
[
|
||||
{
|
||||
"memory": "4072",
|
||||
"disk": "30",
|
||||
"arch": "x86_64",
|
||||
"pm_user": "stack",
|
||||
"pm_addr": "192.168.122.1",
|
||||
"pm_password": "contents of ssh private key go here",
|
||||
"pm_type": "pxe_ssh",
|
||||
"mac": [
|
||||
"00:76:31:1f:f2:a0"
|
||||
],
|
||||
"cpu": "1"
|
||||
},
|
||||
{
|
||||
"memory": "4072",
|
||||
"disk": "30",
|
||||
"arch": "x86_64",
|
||||
"pm_user": "stack",
|
||||
"pm_addr": "192.168.122.1",
|
||||
"pm_password": "contents of ssh private key go here",
|
||||
"pm_type": "pxe_ssh",
|
||||
"mac": [
|
||||
"00:76:31:1f:f2:a0"
|
||||
],
|
||||
"cpu": "1"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
For baremetal:
|
||||
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"pm_password": "ipmi password goes here",
|
||||
"pm_type": "pxe_ipmitool",
|
||||
"mac": [
|
||||
"ipmi mac address goes here"
|
||||
],
|
||||
"cpu": "4",
|
||||
"memory": "32768",
|
||||
"disk": "900",
|
||||
"arch": "x86_64",
|
||||
"pm_user": "ipmi username goes here",
|
||||
"pm_addr": "ipmi ip address goes here"
|
||||
},
|
||||
{
|
||||
"pm_password": "ipmi password goes here",
|
||||
"pm_type": "pxe_ipmitool",
|
||||
"mac": [
|
||||
"ipmi mac address goes here"
|
||||
],
|
||||
"cpu": "4",
|
||||
"memory": "32768",
|
||||
"disk": "900",
|
||||
"arch": "x86_64",
|
||||
"pm_user": "ipmi username goes here",
|
||||
"pm_addr": "ipmi ip address goes here"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
Overcloud image building
|
||||
========================
|
||||
|
||||
Using tripleo packages
|
||||
----------------------
|
||||
1. Enable copr.
|
||||
|
||||
sudo curl -o /etc/yum.repos.d/slagle-openstack-m.repo https://copr.fedoraproject.org/coprs/slagle/openstack-m/repo/fedora-20/slagle-openstack-m-fedora-20.repo
|
||||
|
||||
1. Install instack-undercloud
|
||||
|
||||
sudo yum -y install instack-undercloud diskimage-builder openstack-tripleo-image-elements
|
||||
|
||||
1. Build images. Enable the use of the needed extra elements for now.
|
||||
|
||||
export DIB_COMMON_ELEMENTS="tripleo-image-elements copr-openstack-m rdo-juno-stage"
|
||||
instack-build-images
|
||||
# Note that you can build just a single image type by passing the image name as the first
|
||||
# argument to instack-build-images like so:
|
||||
# instack-build-images overcloud-control
|
||||
|
||||
Using tripleo source
|
||||
--------------------
|
||||
|
||||
1. Create initial directory for instack, and clone the needed repositories.
|
||||
|
||||
|
||||
mkdir instack
|
||||
cd instack
|
||||
git clone https://github.com/rdo-management/instack-undercloud
|
||||
|
||||
1. Setup needed checkouts. If you don't want to use Delorean packages, or the
|
||||
last known good commits (use latest from trunk), then set those environment
|
||||
variables to 0. Exporting RUN_INSTACK=0 will create the initial
|
||||
checkouts. Note however that some pip dependencies will still be installed on
|
||||
the machine.
|
||||
|
||||
# If you don't want to use Delorean...
|
||||
# export DELOREAN=0
|
||||
# If you don't want to use the last known good commits...
|
||||
# export LKG=0
|
||||
|
||||
source instack-undercloud/instack-sourcerc
|
||||
export RUN_INSTACK=0
|
||||
instack-install-undercloud-source
|
||||
|
||||
2. Run script to build images. This will create any Overcloud images and
|
||||
deployment images that don't already exist in the current directory. If you
|
||||
only need to rebuild a single image, make sure the other images already exist
|
||||
in the current directory.
|
||||
|
||||
instack-build-images
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
instack-undercloud scale mode
|
||||
=============================
|
||||
|
||||
instack-undercloud offers 2 deployment modes: poc and scale.
|
||||
|
||||
In poc mode, a minimal baremtal flavor is automatically created and used as
|
||||
the flavor for all the different role types in an overcloud. Nodes with
|
||||
different hardware characteristics will be used for any role type as long as
|
||||
they meet the requirements of the minimal baremetal flavor. Poc mode is the
|
||||
default, and matches the existing virtual environement setups behavior that
|
||||
currently exists.
|
||||
|
||||
In scale mode, no initial flavors are created. Instead, the deployer must
|
||||
create a flavor per hardware profile they intend to use in their deployment.
|
||||
They must also assign each of these flavors to overcloud roles via Heat
|
||||
template parameters.
|
||||
|
||||
The following steps can be used to setup an undercloud in scale deployment
|
||||
mode.
|
||||
|
||||
1. On the virt host, make any hardware characteristic changes to the baremetal
|
||||
VM's created as part of instack-virt-setup. You can make changes to CPU, Disk,
|
||||
and Memory.
|
||||
|
||||
2. In the instack.answers file, before running the installation script, set
|
||||
DEPLOYMENT_MODE to scale.
|
||||
|
||||
DEPLOYMENT_MODE=scale
|
||||
|
||||
3. After the completed installation, create the baremetal flavors to correspond
|
||||
to the overcloud roles you intend to deploy. These are example commands.
|
||||
|
||||
nova flavor-create control auto 4096 40 2
|
||||
nova flavor-create compute auto 1024 40 1
|
||||
nova flavor-create blockstorage auto 1024 40 1
|
||||
nova flavor-create swiftstorage auto 1024 40 1
|
||||
deploy_kernel_id=$(glance image-show bm-deploy-kernel | awk ' / id / {print $4}')
|
||||
deploy_ramdisk_id=$(glance image-show bm-deploy-ramdisk | awk ' / id / {print $4}')
|
||||
nova flavor-key control set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$deploy_kernel_id" "baremetal:deploy_ramdisk_id"="$deploy_ramdisk_id"
|
||||
nova flavor-key compute set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$deploy_kernel_id" "baremetal:deploy_ramdisk_id"="$deploy_ramdisk_id"
|
||||
nova flavor-key blockstorage set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$deploy_kernel_id" "baremetal:deploy_ramdisk_id"="$deploy_ramdisk_id"
|
||||
nova flavor-key swiftstorage set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$deploy_kernel_id" "baremetal:deploy_ramdisk_id"="$deploy_ramdisk_id"
|
||||
|
||||
4. Before running instack-deploy-overcloud, edit instackenv.json and update the
|
||||
node hardware characterists to match what edits you made to the actual VM's.
|
||||
|
||||
5. Export the folling environment variables to set Heat Parmeters for the
|
||||
flavors to use for each Overcloud role. Any of the following parameters not set
|
||||
will default to "baremetal".
|
||||
|
||||
export OVERCLOUD_CONTROL_FLAVOR=control
|
||||
export OVERCLOUD_COMPUTE_FLAVOR=compute
|
||||
export OVERCLOUD_BLOCKSTORAGE_FLAVOR=blockstorage
|
||||
export OVERCLOUD_SWIFTSTORAGE_FLAVOR=swiftstorage
|
||||
|
||||
6. Continue deploying an Overcloud as normal by sourceing deploy-overcloudrc
|
||||
and running instack-deploy-overcloud.
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
Undercloud Install via instack
|
||||
==============================
|
||||
|
||||
instack-undercloud can be used to setup Juno in a virtual environment.
|
||||
instack-undercloud documentation:
|
||||
https://repos.fedorapeople.org/repos/openstack-m/instack-undercloud/html/
|
||||
|
||||
To use instack-undercloud in an all virtual environment using instack-undercloud from git, perform the setup at
|
||||
[README-source](README-source.md).
|
||||
To build the docs locally:
|
||||
|
||||
To use instack-undercloud in an all virtual environment using packages, perform the setup at
|
||||
[README-packages](README-packages.md).
|
||||
tox -e docs
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
Building the instack-virt-setup Docker image
|
||||
--------------------------------------------
|
||||
There is no reason to build the Docker image yourself if you pulled it
|
||||
following the commands above. These steps are here just to document the build
|
||||
process.
|
||||
|
||||
Building the docker image is a multi-step process. There is a Dockerfile to
|
||||
assist with building the initial image.
|
||||
|
||||
1. Run through instack-virt-setup on the build host, start the instack vm,
|
||||
install the undercloud, load the images into glance. shutdown the instack
|
||||
vm.
|
||||
|
||||
1. After the instack vm is started, ssh to the vm and create the answers file
|
||||
and deploy-virt-overcloudrc underneath /home/stack. Be sure to populate
|
||||
$MACS in deploy-virt-overcloudrc with the actual values of the baremetal vm
|
||||
nodes as created from instack-virt-setup.
|
||||
|
||||
1. Poweroff the instack vm.
|
||||
|
||||
1. Run the rest of the commands here as root
|
||||
|
||||
1. Clone this git repository, switch to the docker branch, and cd to the docker
|
||||
build directory.
|
||||
|
||||
git clone https://github.com/rdo-management/instack-undercloud
|
||||
cd instack-undercloud
|
||||
git checkout docker
|
||||
cd docker/instack-virt
|
||||
|
||||
1. Copy needed files from the build host into the build directory.
|
||||
|
||||
cp /var/lib/libvirt/images/instack.qcow2 .
|
||||
cp /etc/libvirt/qemu/baremetal_0.xml .
|
||||
cp /etc/libvirt/qemu/baremetal_1.xml .
|
||||
cp /etc/libvirt/qemu/baremetal_2.xml .
|
||||
cp /etc/libvirt/qemu/baremetal_3.xml .
|
||||
cp /etc/libvirt/qemu/instack.xml .
|
||||
cp /etc/libvirt/qemu/networks/default.xml .
|
||||
cp /etc/libvirt/qemu/networks/brbm.xml .
|
||||
cp /home/stack/.ssh/id_rsa_virt_power* .
|
||||
|
||||
1. Update the vm xml definitions to remove the selinux relabel command
|
||||
|
||||
sed -i '/selinux/d' instack.xml baremetal_*.xml
|
||||
|
||||
1. View instack.xml and get the mac address of the default network interface.
|
||||
|
||||
1. Edit default.xml and add the following line in the `<dhcp>` stanza. Replace
|
||||
the value for mac with the mac address you got in the previous step.
|
||||
|
||||
<host mac='52:54:00:e1:f3:7e' name='instack' ip='192.168.122.100'/>
|
||||
|
||||
1. Sparsify instack.qcow2
|
||||
|
||||
virt-sparsify instack.qcow2 instack.qcow2.new
|
||||
mv instack.qcow2.new instack.qcow2
|
||||
|
||||
1. Pull the Fedora base image and then build the docker image
|
||||
|
||||
docker pull fedora
|
||||
docker build -t instack-virt .
|
||||
|
||||
1. Optionally tag and push the image.
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
Instack Docker Setup
|
||||
====================
|
||||
|
||||
The instack Docker setup provides an environment equivalent to that produced by
|
||||
running instack-virt-setup in a reuseable Docker container.
|
||||
|
||||
|
||||
Running the instack-virt-setup Docker image
|
||||
-------------------------------------------
|
||||
|
||||
1. Pre-requisites.
|
||||
|
||||
# Run these commands as root
|
||||
yum install docker-io qemu-kvm
|
||||
modprobe kvm
|
||||
modprobe openvswitch
|
||||
systemctl start docker
|
||||
|
||||
1. Pull the image from the docker registry.
|
||||
|
||||
# Run these commands as root
|
||||
# Note that this is about an 8GB download as it contains a fully
|
||||
# installed undercloud with all the overcloud images already loaded into
|
||||
# glance.
|
||||
docker pull slagle/instack-virt
|
||||
|
||||
1. Create a directory on your docker host to mount into the container for
|
||||
storage. This directory should have at least 30GB free.
|
||||
|
||||
# Run these commands as root
|
||||
mkdir -p /storage/docker/lib/instack-virt-environment
|
||||
|
||||
1. Start the container. The container must be started with --privileged so that libvirt
|
||||
has access to create networks. The host path created in the previous step is
|
||||
also mounted into the container at /var/lib/libvirt/images for the instack vm's
|
||||
to use for their disks.
|
||||
|
||||
# Run these commands as root
|
||||
setenforce 0
|
||||
docker run \
|
||||
-it \
|
||||
--name instack-virt-environment \
|
||||
--privileged \
|
||||
--volume /storage/docker/lib/instack-virt-environment:/var/lib/libvirt/images \
|
||||
slagle/instack-virt
|
||||
|
||||
1. Open a new termainl and look up the IP address of the container
|
||||
|
||||
# Run these commands as root
|
||||
docker inspect instack-virt-environment | grep IPAddress
|
||||
|
||||
1. ssh as stack to the container's IP address. The initial stack password is also stack.
|
||||
|
||||
1. Once ssh'd into the container, start the instack vm
|
||||
|
||||
virsh start instack
|
||||
|
||||
The IP address of the instack vm will be 192.168.122.100. ssh as the stack
|
||||
user (initial password is stack) to the instack vm. It may take a minute or 2 for it to
|
||||
come up.
|
||||
|
||||
ssh stack@192.168.122.100
|
||||
|
||||
1. Once ssh'd to the instack vm, you must wait for the run of os-collect-config to complete. It should
|
||||
complete in < 5 minutes. Use the following command to check for completion.
|
||||
|
||||
sudo journalctl -u os-collect-config --full -f | grep "Completed phase migration"
|
||||
|
||||
1. Once os-collect-config has comleted, you can source the necessary files and
|
||||
verify the images are already loaded in glance. Note that you must source
|
||||
the 3 files below anytime you want to use the OpenStack clients. The paths
|
||||
are relative to /home/stack.
|
||||
|
||||
source instack-undercloud/instack-sourcerc
|
||||
source tripleo-undercloud-passwords
|
||||
source stackrc
|
||||
glance image-list
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
FROM fedora
|
||||
MAINTAINER James Slagle <slagle@redhat.com>
|
||||
|
||||
RUN yum -y install supervisor
|
||||
|
||||
RUN yum -y install openssh-server
|
||||
RUN echo root | passwd --stdin root
|
||||
EXPOSE 22
|
||||
RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
|
||||
|
||||
RUN yum -y install libvirt libvirt-daemon-kvm
|
||||
COPY libvirtd.ini /etc/supervisord.d/libvirtd.ini
|
||||
|
||||
RUN yum -y install openvswitch
|
||||
|
||||
|
||||
RUN useradd stack
|
||||
RUN echo stack | passwd --stdin stack
|
||||
RUN echo "stack ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/stack
|
||||
RUN chmod 0440 /etc/sudoers.d/stack
|
||||
|
||||
RUN echo 'export LIBVIRT_DEFAULT_URI="qemu:///system"' >> /home/stack/.bashrc
|
||||
|
||||
RUN groupadd libvirtd; usermod -a -G libvirtd stack
|
||||
RUN sed -i "s/^#unix_sock_group.*/unix_sock_group = \"libvirtd\"/g" /etc/libvirt/libvirtd.conf; \
|
||||
sed -i 's/^#auth_unix_rw.*/auth_unix_rw = "none"/g' /etc/libvirt/libvirtd.conf; \
|
||||
sed -i 's/^#unix_sock_rw_perms.*/unix_sock_rw_perms = "0770"/g' /etc/libvirt/libvirtd.conf
|
||||
|
||||
RUN yum clean all
|
||||
|
||||
COPY sshd.ini /etc/supervisord.d/sshd.ini
|
||||
COPY baremetal_0.xml /etc/libvirt/qemu/baremetal_0.xml
|
||||
COPY baremetal_1.xml /etc/libvirt/qemu/baremetal_1.xml
|
||||
COPY baremetal_2.xml /etc/libvirt/qemu/baremetal_2.xml
|
||||
COPY baremetal_3.xml /etc/libvirt/qemu/baremetal_3.xml
|
||||
COPY instack.xml /etc/libvirt/qemu/instack.xml
|
||||
COPY default.xml /etc/libvirt/qemu/networks/default.xml
|
||||
COPY brbm.xml /etc/libvirt/qemu/networks/brbm.xml
|
||||
COPY instack.qcow2 /var/lib/libvirt/base-images/instack.qcow2
|
||||
|
||||
RUN mkdir -p /home/stack/.ssh
|
||||
COPY id_rsa_virt_power.pub /home/stack/.ssh/authorized_keys
|
||||
RUN chown -R stack: /home/stack; \
|
||||
chmod 0700 /home/stack/.ssh; \
|
||||
chmod 0600 /home/stack/.ssh/authorized_keys
|
||||
|
||||
COPY start.sh /start.sh
|
||||
RUN chmod 0755 /start.sh
|
||||
CMD /start.sh
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[program:libvirtd]
|
||||
command=/usr/sbin/libvirtd
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[program:sshd]
|
||||
command=/usr/sbin/sshd -D
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
for i in $(seq 0 4); do
|
||||
if [ ! -f /var/lib/libvirt/images/baremetal_$i.qcow2 ]; then
|
||||
qemu-img create -f qcow2 /var/lib/libvirt/images/baremetal_$i.qcow2 31G
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ! -f /var/lib/libvirt/images/instack.qcow2 ]; then
|
||||
qemu-img create -f qcow2 -b /var/lib/libvirt/base-images/instack.qcow2 /var/lib/libvirt/images/instack.qcow2
|
||||
fi
|
||||
|
||||
/usr/share/openvswitch/scripts/ovs-ctl start --system-id=random
|
||||
ovs-vsctl list-br | grep brbm || ovs-vsctl add-br brbm
|
||||
|
||||
supervisord -n
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
iso:
|
||||
livemedia-creator \
|
||||
--ks instack.ks \
|
||||
--make-iso \
|
||||
--iso /storage/isos/Fedora-20-x86_64-netinst.iso \
|
||||
--proxy http://192.168.122.1:3128 \
|
||||
--tmp .
|
||||
|
||||
appliance:
|
||||
livemedia-creator \
|
||||
--ks instack.ks \
|
||||
--iso /storage/isos/Fedora-20-x86_64-netinst.iso \
|
||||
--proxy http://192.168.122.1:3128 \
|
||||
--make-appliance \
|
||||
--tmp .
|
||||
|
||||
iso-source:
|
||||
livemedia-creator \
|
||||
--ks instack-source-livecd.ks \
|
||||
--make-iso \
|
||||
--iso /storage/isos/Fedora-20-x86_64-netinst.iso \
|
||||
--proxy http://192.168.122.1:3128 \
|
||||
--title "OpenStack Management Title" \
|
||||
--project "OpenStack Management Fedora" \
|
||||
--releasever 20 \
|
||||
--tmp .
|
||||
|
||||
appliance-source:
|
||||
livemedia-creator \
|
||||
--ks instack-source-livecd.ks \
|
||||
--iso /storage/isos/Fedora-20-x86_64-netinst.iso \
|
||||
--proxy http://192.168.122.1:3128 \
|
||||
--make-appliance \
|
||||
--tmp .
|
||||
|
||||
livecd-tools-iso:
|
||||
livecd-creator \
|
||||
--debug \
|
||||
--verbose \
|
||||
--config instack-livecd.ks \
|
||||
--title "OpenStack Management Title" \
|
||||
--product "OpenStack Management Fedora" \
|
||||
--releasever 20 \
|
||||
--cache /var/cache/livecd-tools \
|
||||
--tmpdir /tmp
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
# Network information
|
||||
network --bootproto=dhcp --onboot=on --activate
|
||||
# System authorization information
|
||||
auth --useshadow --enablemd5
|
||||
# System keyboard
|
||||
keyboard --xlayouts=us --vckeymap=us
|
||||
# System language
|
||||
lang en_US.UTF-8
|
||||
# System timezone
|
||||
timezone US/Eastern
|
||||
|
||||
%post --nochroot
|
||||
|
||||
rm -f /mnt/sysimage/home/stack/Desktop/liveinst.desktop
|
||||
rm -f /mnt/sysimage/home/stack/.config/autostart/liveinst.desktop
|
||||
|
||||
# Disable NetworkManager as well
|
||||
# rm -f '/mnt/sysimage/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service'
|
||||
# rm -f '/mnt/sysimage/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service'
|
||||
# rm -f '/mnt/sysimage/etc/systemd/system/multi-user.target.wants/NetworkManager.service'
|
||||
|
||||
# firewalld is installed back by anaconda, so we must totally disable it.
|
||||
rm -f '/mnt/sysimage/etc/systemd/system/basic.target.wants/firewalld.service'
|
||||
rm -f '/mnt/sysimage/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service'
|
||||
|
||||
|
||||
cat << EOF >> /mnt/sysimage/home/stack/.config/autostart/instack.desktop
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Version=0.9.4
|
||||
Type=Application
|
||||
Name=instack
|
||||
Comment=
|
||||
Exec=/usr/bin/instack-apply-config
|
||||
OnlyShowIn=XFCE;
|
||||
StartupNotify=false
|
||||
Terminal=true
|
||||
Hidden=false
|
||||
EOF
|
||||
|
||||
%end
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
%include /usr/share/spin-kickstarts/fedora-livecd-xfce.ks
|
||||
|
||||
# Network information
|
||||
network --device=eth0 --nameserver=8.8.8.8 --bootproto=dhcp --onboot=on --activate
|
||||
|
||||
# Disk partitioning information
|
||||
part / --fstype="ext4" --size=4000
|
||||
part swap --size=1000
|
||||
|
||||
%post
|
||||
|
||||
/usr/sbin/useradd stack
|
||||
/usr/sbin/usermod -G wheel -a stack
|
||||
echo stack | passwd stack --stdin
|
||||
|
||||
# Remove root password
|
||||
passwd -d root > /dev/null
|
||||
|
||||
# Show harddisk install on the desktop
|
||||
mkdir /home/stack/Desktop
|
||||
cp /usr/share/applications/liveinst.desktop /home/stack/Desktop
|
||||
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /home/stack/Desktop/liveinst.desktop
|
||||
sed -i -e 's/Exec=\/usr\/bin\/liveinst/\0 --kickstart \/home\/stack\/instack-undercloud\/live\/instack-install.ks/' /home/stack/Desktop/liveinst.desktop
|
||||
sed -i -e 's/Terminal=false/Terminal=true/' /home/stack/Desktop/liveinst.desktop
|
||||
mkdir -p /home/stack/.config/autostart
|
||||
ln -s /home/stack/Desktop/liveinst.desktop /home/stack/.config/autostart
|
||||
|
||||
# and mark it as executable (new Xfce security feature)
|
||||
chmod +x /home/stack/Desktop/liveinst.desktop
|
||||
|
||||
# deactivate xfce4-panel first-run dialog (#693569)
|
||||
mkdir -p /home/stack/.config/xfce4/xfconf/xfce-perchannel-xml
|
||||
cp /etc/xdg/xfce4/panel/default.xml /home/stack/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
|
||||
|
||||
pushd /home/stack
|
||||
|
||||
ssh-keygen -t rsa -N "" -f /home/stack/id_rsa_virt_power
|
||||
|
||||
curl -o /etc/yum.repos.d/slagle-openstack-m.repo https://copr.fedoraproject.org/coprs/slagle/openstack-m/repo/fedora-20/slagle-openstack-m-fedora-20.repo
|
||||
yum -y install instack-undercloud
|
||||
cp /usr/share/instack-undercloud/instack.answers.sample /home/stack/instack.answers
|
||||
# instack-install-undercloud sources ~/instack.answers, and during the
|
||||
# %chroot phase, apparently ~ evaluates to /tmp. So, we need to copy the
|
||||
# answers file there as well.
|
||||
cp instack-undercloud/instack-baremetal.answers.sample ~/instack.answers
|
||||
|
||||
export RUN_ORC=0
|
||||
export HOME=/home/stack
|
||||
export PATH=/usr/bin:/usr/sbin/:/sbin
|
||||
instack-install-undercloud
|
||||
|
||||
cat << EOF >> /etc/fstab
|
||||
tmpfs /mnt tmpfs rw 0 0
|
||||
EOF
|
||||
|
||||
# Clean up answers file
|
||||
rm -f ~/instack.answers
|
||||
|
||||
popd
|
||||
|
||||
# this goes at the end after all other changes.
|
||||
chown -R stack:stack /home/stack
|
||||
restorecon -R /home/stack
|
||||
|
||||
# disable os-collect-config
|
||||
rm -f /etc/systemd/system/multi-user.target.wants/os-collect-config.service
|
||||
|
||||
# need to reinstall anaconda
|
||||
yum -y install anaconda
|
||||
# firewalld is installed back by anaconda, so we must totally disable it.
|
||||
rm '/etc/systemd/system/basic.target.wants/firewalld.service'
|
||||
rm '/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service'
|
||||
|
||||
# need to reinstall grub2
|
||||
yum -y install grub2
|
||||
|
||||
%end
|
||||
|
||||
%packages
|
||||
anaconda
|
||||
firefox
|
||||
ucs-miscfixed-fonts
|
||||
bitmap-fixed-fonts
|
||||
shadow-utils
|
||||
|
||||
-@xfce-apps
|
||||
-@xfce-extra-plugins
|
||||
-@xfce-media
|
||||
-@xfce-office
|
||||
-@virtualization
|
||||
|
||||
%end
|
||||
|
|
@ -1,180 +0,0 @@
|
|||
# Minimal Disk Image
|
||||
#
|
||||
# Firewall configuration
|
||||
firewall --enabled
|
||||
# Use network installation
|
||||
url --url="http://mirror.pnl.gov/fedora/linux/releases/20/Everything/x86_64/os/"
|
||||
repo --name=updates --baseurl="http://mirror.pnl.gov/fedora/linux/updates/20/x86_64/"
|
||||
|
||||
|
||||
# Root password
|
||||
rootpw --plaintext removethispw
|
||||
# Network information
|
||||
network --bootproto=dhcp --onboot=on --activate
|
||||
# System authorization information
|
||||
auth --useshadow --enablemd5
|
||||
# System keyboard
|
||||
keyboard --xlayouts=us --vckeymap=us
|
||||
# System language
|
||||
lang en_US.UTF-8
|
||||
# SELinux configuration
|
||||
selinux --enforcing
|
||||
# Installation logging level
|
||||
logging --level=info
|
||||
# Shutdown after installation
|
||||
shutdown
|
||||
# System timezone
|
||||
timezone US/Eastern
|
||||
# System bootloader configuration
|
||||
bootloader --location=mbr
|
||||
# Clear the Master Boot Record
|
||||
zerombr
|
||||
# Partition clearing information
|
||||
clearpart --all
|
||||
# Disk partitioning information
|
||||
part / --fstype="ext4" --size=4000
|
||||
part swap --size=1000
|
||||
|
||||
xconfig --startxonboot
|
||||
|
||||
%post
|
||||
|
||||
# Update everything
|
||||
yum clean all
|
||||
yum -y update
|
||||
|
||||
useradd stack
|
||||
usermod -G wheel -a stack
|
||||
echo stack | passwd stack --stdin
|
||||
|
||||
# Remove root password
|
||||
passwd -d root > /dev/null
|
||||
|
||||
# fstab from the install won't match anything. remove it and let dracut
|
||||
# handle mounting.
|
||||
cat /dev/null > /etc/fstab
|
||||
|
||||
# This is a huge file and things work ok without it
|
||||
rm -f /usr/share/icons/HighContrast/icon-theme.cache
|
||||
|
||||
# create /etc/sysconfig/desktop (needed for installation)
|
||||
|
||||
cat > /etc/sysconfig/desktop <<EOF
|
||||
PREFERRED=/usr/bin/startxfce4
|
||||
DISPLAYMANAGER=/usr/sbin/lightdm
|
||||
EOF
|
||||
|
||||
# deactivate xfconf-migration (#683161)
|
||||
rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
|
||||
|
||||
# set up lightdm autologin
|
||||
sed -i 's/^#autologin-user=.*/autologin-user=stack/' /etc/lightdm/lightdm.conf
|
||||
sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
|
||||
#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
|
||||
|
||||
# set Xfce as default session, otherwise login will fail
|
||||
sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
|
||||
|
||||
# Show harddisk install on the desktop
|
||||
mkdir /home/stack/Desktop
|
||||
cp /usr/share/applications/liveinst.desktop /home/stack/Desktop
|
||||
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /home/stack/Desktop/liveinst.desktop
|
||||
sed -i -e 's/Exec=\/usr\/bin\/liveinst/\0 --kickstart \/usr\/share\/instack-undercloud\/live\/instack-install.ks/' /home/stack/Desktop/liveinst.desktop
|
||||
sed -i -e 's/Terminal=false/Terminal=true/' /home/stack/Desktop/liveinst.desktop
|
||||
mkdir -p /home/stack/.config/autostart
|
||||
ln -s /home/stack/Desktop/liveinst.desktop /home/stack/.config/autostart
|
||||
|
||||
# and mark it as executable (new Xfce security feature)
|
||||
chmod +x /home/stack/Desktop/liveinst.desktop
|
||||
|
||||
# deactivate xfce4-panel first-run dialog (#693569)
|
||||
mkdir -p /home/stack/.config/xfce4/xfconf/xfce-perchannel-xml
|
||||
cp /etc/xdg/xfce4/panel/default.xml /home/stack/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
|
||||
|
||||
pushd /home/stack
|
||||
|
||||
ssh-keygen -t rsa -N "" -f /home/stack/virtual-power-key
|
||||
|
||||
curl -o /etc/yum.repos.d/slagle-openstack-m.repo https://copr.fedoraproject.org/coprs/slagle/openstack-m/repo/fedora-20/slagle-openstack-m-fedora-20.repo
|
||||
yum -y install https://slagle.fedorapeople.org/copr/instack-undercloud-1.0.10-1.fc20.noarch.rpm
|
||||
cp /usr/share/doc/instack-undercloud/instack.answers.sample /home/stack/instack.answers
|
||||
# instack-install-undercloud sources ~/instack.answers, and during the
|
||||
# %chroot phase, apparently ~ evaluates to /tmp. So, we need to copy the
|
||||
# answers file there as well.
|
||||
cp /usr/share/doc/instack-undercloud/instack.answers.sample ~/instack.answers
|
||||
|
||||
export RUN_ORC=0
|
||||
instack-install-undercloud-source
|
||||
|
||||
cat << EOF >> /etc/fstab
|
||||
tmpfs /mnt tmpfs rw 0 0
|
||||
EOF
|
||||
|
||||
# Clean up answers file
|
||||
rm -f ~/instack.answers
|
||||
|
||||
popd
|
||||
|
||||
# this goes at the end after all other changes.
|
||||
chown -R stack:stack /home/stack
|
||||
restorecon -R /home/stack
|
||||
|
||||
# disable os-collect-config
|
||||
rm -f /etc/systemd/system/multi-user.target.wants/os-collect-config.service
|
||||
# disable crond so that os-refresh-config on boot job does not start
|
||||
rm -f /etc/systemd/system/multi-user.target.wants/crond.service
|
||||
|
||||
# need to reinstall anaconda
|
||||
yum -y install anaconda
|
||||
# firewalld is installed back by anaconda, so we must totally disable it.
|
||||
rm '/etc/systemd/system/basic.target.wants/firewalld.service'
|
||||
rm '/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service'
|
||||
|
||||
%end
|
||||
|
||||
%packages
|
||||
@core
|
||||
kernel
|
||||
memtest86+
|
||||
grub2-efi
|
||||
grub2
|
||||
shim
|
||||
syslinux
|
||||
|
||||
anaconda
|
||||
git
|
||||
firefox
|
||||
ucs-miscfixed-fonts
|
||||
bitmap-fixed-fonts
|
||||
#@virtualization
|
||||
|
||||
@xfce-desktop
|
||||
# @xfce-apps
|
||||
# @xfce-extra-plugins
|
||||
# @xfce-media
|
||||
# @xfce-office
|
||||
|
||||
@base-x
|
||||
# @guest-desktop-agents
|
||||
# @standard
|
||||
@input-methods
|
||||
@hardware-support
|
||||
|
||||
|
||||
# unlock default keyring. FIXME: Should probably be done in comps
|
||||
gnome-keyring-pam
|
||||
|
||||
-dracut-config-rescue
|
||||
|
||||
-dnf
|
||||
|
||||
# Try to get around the broken dep during the instack install around
|
||||
# glibc-devel, adding packages manually here.
|
||||
libffi-devel
|
||||
gcc
|
||||
python-devel
|
||||
openssl-devel
|
||||
libxml2-devel
|
||||
libxslt-devel
|
||||
|
||||
%end
|
||||
Loading…
Reference in New Issue