diff --git a/contrib/mk_bootstrap/files/README.md b/contrib/fuel_bootstrap/files/README.md similarity index 100% rename from contrib/mk_bootstrap/files/README.md rename to contrib/fuel_bootstrap/files/README.md diff --git a/contrib/mk_bootstrap/files/trusty/etc/e2fsck.conf b/contrib/fuel_bootstrap/files/trusty/etc/e2fsck.conf similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/e2fsck.conf rename to contrib/fuel_bootstrap/files/trusty/etc/e2fsck.conf diff --git a/contrib/mk_bootstrap/files/trusty/etc/hostname b/contrib/fuel_bootstrap/files/trusty/etc/hostname similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/hostname rename to contrib/fuel_bootstrap/files/trusty/etc/hostname diff --git a/contrib/mk_bootstrap/files/trusty/etc/localtime b/contrib/fuel_bootstrap/files/trusty/etc/localtime similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/localtime rename to contrib/fuel_bootstrap/files/trusty/etc/localtime diff --git a/contrib/mk_bootstrap/files/trusty/etc/logrotate.d/syslog b/contrib/fuel_bootstrap/files/trusty/etc/logrotate.d/syslog similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/logrotate.d/syslog rename to contrib/fuel_bootstrap/files/trusty/etc/logrotate.d/syslog diff --git a/contrib/mk_bootstrap/files/trusty/etc/mcollective/server.cfg b/contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/mcollective/server.cfg rename to contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg diff --git a/contrib/mk_bootstrap/files/trusty/etc/modprobe.d/blacklist-i2c-piix4.conf b/contrib/fuel_bootstrap/files/trusty/etc/modprobe.d/blacklist-i2c-piix4.conf similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/modprobe.d/blacklist-i2c-piix4.conf rename to contrib/fuel_bootstrap/files/trusty/etc/modprobe.d/blacklist-i2c-piix4.conf diff --git a/contrib/mk_bootstrap/files/trusty/etc/modprobe.d/mlnx4_core.conf b/contrib/fuel_bootstrap/files/trusty/etc/modprobe.d/mlnx4_core.conf similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/modprobe.d/mlnx4_core.conf rename to contrib/fuel_bootstrap/files/trusty/etc/modprobe.d/mlnx4_core.conf diff --git a/contrib/mk_bootstrap/files/trusty/etc/nailgun_systemtype b/contrib/fuel_bootstrap/files/trusty/etc/nailgun_systemtype similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/nailgun_systemtype rename to contrib/fuel_bootstrap/files/trusty/etc/nailgun_systemtype diff --git a/contrib/mk_bootstrap/files/trusty/etc/rc.local b/contrib/fuel_bootstrap/files/trusty/etc/rc.local similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/rc.local rename to contrib/fuel_bootstrap/files/trusty/etc/rc.local diff --git a/contrib/mk_bootstrap/files/trusty/etc/rsyslog.d/50-default-template.conf b/contrib/fuel_bootstrap/files/trusty/etc/rsyslog.d/50-default-template.conf similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/rsyslog.d/50-default-template.conf rename to contrib/fuel_bootstrap/files/trusty/etc/rsyslog.d/50-default-template.conf diff --git a/contrib/mk_bootstrap/files/trusty/etc/send2syslog.conf b/contrib/fuel_bootstrap/files/trusty/etc/send2syslog.conf similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/send2syslog.conf rename to contrib/fuel_bootstrap/files/trusty/etc/send2syslog.conf diff --git a/contrib/mk_bootstrap/files/trusty/etc/ssh/sshd_config b/contrib/fuel_bootstrap/files/trusty/etc/ssh/sshd_config similarity index 100% rename from contrib/mk_bootstrap/files/trusty/etc/ssh/sshd_config rename to contrib/fuel_bootstrap/files/trusty/etc/ssh/sshd_config diff --git a/contrib/mk_bootstrap/files/trusty/usr/bin/fix-configs-on-startup b/contrib/fuel_bootstrap/files/trusty/usr/bin/fix-configs-on-startup similarity index 100% rename from contrib/mk_bootstrap/files/trusty/usr/bin/fix-configs-on-startup rename to contrib/fuel_bootstrap/files/trusty/usr/bin/fix-configs-on-startup diff --git a/contrib/mk_bootstrap/files/trusty/usr/bin/send2syslog.py b/contrib/fuel_bootstrap/files/trusty/usr/bin/send2syslog.py similarity index 100% rename from contrib/mk_bootstrap/files/trusty/usr/bin/send2syslog.py rename to contrib/fuel_bootstrap/files/trusty/usr/bin/send2syslog.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/AUTHORS b/contrib/fuel_bootstrap/fuel_bootstrap_cli/AUTHORS similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/AUTHORS rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/AUTHORS diff --git a/contrib/mk_bootstrap/fuel_bootstrap/MANIFEST.in b/contrib/fuel_bootstrap/fuel_bootstrap_cli/MANIFEST.in similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/MANIFEST.in rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/MANIFEST.in diff --git a/contrib/mk_bootstrap/fuel_bootstrap/README.md b/contrib/fuel_bootstrap/fuel_bootstrap_cli/README.md similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/README.md rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/README.md diff --git a/contrib/mk_bootstrap/fuel_bootstrap/README.rst b/contrib/fuel_bootstrap/fuel_bootstrap_cli/README.rst similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/README.rst rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/README.rst diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/__init__.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/__init__.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/__init__.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/__init__.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/__init__.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/__init__.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/__init__.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/__init__.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/delete.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/delete.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/delete.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/delete.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/import.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/import.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/import.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/import.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/list.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/list.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/commands/list.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/list.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/consts.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/consts.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/errors.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/errors.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/errors.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/errors.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/main.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/main.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/main.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/main.py diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample new file mode 100644 index 0000000..a020c98 --- /dev/null +++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample @@ -0,0 +1,116 @@ +--- +# User can pass any type of executable script +#post_script_file: /tmp/my_custom_script +root_ssh_authorized_file: /root/.ssh/id_rsa.pub +# Extended kernel PXE options +extend_kopts: "biosdevname=0 debug ignore_loglevel log_buf_len=10M print_fatal_signals=1 LOGLEVEL=8" +# Directory that will be injected to the image +# root filesystem. **NOTE** Files/packages will be +# injected after installing all packages, but before +# generating system initramfs - thus it's possible to +# adjust initramfs +extra_files: + - /usr/share/fuel_bootstrap/files/trusty +# Save generated bootstrap container to +output_dir: /tmp/ +# Defines kernel version +kernel-flavor: linux-image-generic-lts-trusty +# Define packages list +packages: + - vim + - mc + - openssh-client + - openssh-server + - ntp + - mcollective + - nailgun-agent + - nailgun-mcagents + - network-checker + - fuel-agent + - ubuntu-minimal + - live-boot + - live-boot-initramfs-tools + - wget + - linux-firmware + - linux-firmware-nonfree + - xz-utils + - squashfs-tools + - msmtp-mta +# Ignore proxy for this repos +#direct_repo_addresses: +# - 127.0.0.1 +# - 172.18.196.50 +# Pass proxy parameters, for access to repos +#http_proxy: "192.168.1.50:8080" +#https_proxy: "192.168.1.50:8080" +# Define upstream ubuntu-mirror +ubuntu_repos: + - + name: ubuntu + priority: None + section: "main universe multiverse" + suite: trusty + type: deb + uri: "http://archive.ubuntu.com/ubuntu" + - + name: ubuntu-updates + priority: None + section: "main universe multiverse" + suite: trusty-updates + type: deb + uri: "http://archive.ubuntu.com/ubuntu" + - + name: ubuntu-security + priority: None + section: "main universe multiverse" + suite: trusty-security + type: deb + uri: "http://archive.ubuntu.com/ubuntu" +# Define MirantisOpenstack mirror +mos_repos: + - + name: mos + priority: "1050" + section: "main restricted" + suite: mos8.0 + type: deb + uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0" + - + name: mos-updates + priority: "1050" + section: "main restricted" + suite: mos8.0-updates + type: deb + uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0" + - + name: mos-security + priority: "1050" + section: "main restricted" + suite: mos8.0-security + type: deb + uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0" + - + name: mos-holdback + priority: "1100" + section: "main restricted" + suite: mos8.0-holdback + type: deb + uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0" +# Define other deb repositories +extra_repos: + - + name: Extra_repo + priority: None + section: main + suite: trusty + type: deb + uri: "http://archive.ubuntu.com/ubuntu" +# For import\activate commands only. +bootstrap_images_dir: "/var/www/nailgun/bootstraps" +# For import\activate commands only +active_bootstrap_symlink: "/var/www/nailgun/bootstraps/active_bootstrap" +# For import\activate commands only +#"fuel_access" +# "user": "admin" +# "password": "admin" + diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/utils/__init__.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/__init__.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/utils/__init__.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/__init__.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/utils/bootstrap_image.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap/utils/bootstrap_image.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py diff --git a/contrib/mk_bootstrap/fuel_bootstrap/requirements.txt b/contrib/fuel_bootstrap/fuel_bootstrap_cli/requirements.txt similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/requirements.txt rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/requirements.txt diff --git a/contrib/mk_bootstrap/fuel_bootstrap/setup.cfg b/contrib/fuel_bootstrap/fuel_bootstrap_cli/setup.cfg similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/setup.cfg rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/setup.cfg diff --git a/contrib/mk_bootstrap/fuel_bootstrap/setup.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/setup.py similarity index 100% rename from contrib/mk_bootstrap/fuel_bootstrap/setup.py rename to contrib/fuel_bootstrap/fuel_bootstrap_cli/setup.py diff --git a/specs/fuel-agent.spec b/specs/fuel-agent.spec index 12af65f..ded4efe 100644 --- a/specs/fuel-agent.spec +++ b/specs/fuel-agent.spec @@ -77,7 +77,7 @@ User-friendly wrapper for user set of scripts from fuel-agent cd %{_builddir}/%{name}-%{version} && python setup.py build #building fuel-bootstrap-cli -cd %{_builddir}/%{name}-%{version}/contrib/mk_bootstrap/fuel_bootstrap/ && PBR_VERSION=%{version} python setup.py build +cd %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/ && PBR_VERSION=%{version} python setup.py build %install cd %{_builddir}/%{name}-%{version} && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/INSTALLED_FILES @@ -92,9 +92,11 @@ install -d -m 755 %{buildroot}%{_datadir}/ironic-fa-bootstrap-configs/ cp -a %{_builddir}/%{name}-%{version}/contrib/ironic/bootstrap-files/* %{buildroot}%{_datadir}/ironic-fa-bootstrap-configs/ #Install fuel-bootstrap-cli files -cd %{_builddir}/%{name}-%{version}/contrib/mk_bootstrap/fuel_bootstrap/ && PBR_VERSION=%{version} python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/contrib/mk_bootstrap/fuel_bootstrap/INSTALLED_FILES -install -d -m 755 %{buildroot}%{_datadir}/mk_bootstrap/files/ -cp -a %{_builddir}/%{name}-%{version}/contrib/mk_bootstrap/files/* %{buildroot}%{_datadir}/mk_bootstrap/files/ +cd %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/ && PBR_VERSION=%{version} python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/INSTALLED_FILES +install -d -m 755 %{buildroot}%{_sysconfdir}/fuel-bootstrap-cli +install -p -D -m 644 %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample %{buildroot}%{_sysconfdir}/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml +install -d -m 755 %{buildroot}%{_datadir}/fuel_bootstrap_cli/files/ +cp -a %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/files/* %{buildroot}%{_datadir}/fuel_bootstrap_cli/files/ %clean @@ -109,9 +111,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %config(noreplace) %{_datadir}/ironic-fa-bootstrap-configs/* %attr(0755,root,root) %config(noreplace) %{_datadir}/ironic-fa-bootstrap-configs/usr/bin/configure-remote-logging.sh -%files -n fuel-bootstrap-cli -f %{_builddir}/%{name}-%{version}/contrib/mk_bootstrap/fuel_bootstrap/INSTALLED_FILES +%files -n fuel-bootstrap-cli -f %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/INSTALLED_FILES %defattr(-,root,root) -%attr(0644,root,root) %config(noreplace) %{_datadir}/mk_bootstrap/files/* -%attr(0755,root,root) %config(noreplace) %{_datadir}/mk_bootstrap/files/trusty/usr/bin/fix-configs-on-startup -%attr(0755,root,root) %config(noreplace) %{_datadir}/mk_bootstrap/files/trusty/usr/bin/send2syslog.py -%attr(0755,root,root) %config(noreplace) %{_datadir}/mk_bootstrap/files/trusty/etc/rc.local +%config(noreplace) %{_sysconfdir}/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml +%attr(0644,root,root) %config(noreplace) %{_datadir}/fuel_bootstrap_cli/files/* +%attr(0755,root,root) %config(noreplace) %{_datadir}/fuel_bootstrap_cli/files/trusty/usr/bin/fix-configs-on-startup +%attr(0755,root,root) %config(noreplace) %{_datadir}/fuel_bootstrap_cli/files/trusty/usr/bin/send2syslog.py +%attr(0755,root,root) %config(noreplace) %{_datadir}/fuel_bootstrap_cli/files/trusty/etc/rc.local diff --git a/tox.ini b/tox.ini index bbe3444..0a8dc1c 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ downloadcache = ~/cache/pip deps = hacking==0.10.2 commands = flake8 {posargs:fuel_agent} - flake8 {posargs:contrib/mk_bootstrap/fuel_bootstrap/fuel_bootstrap} + flake8 {posargs:contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap} [testenv:cover] setenv = VIRTUAL_ENV={envdir}