x/packetary
Code Issues Proposed changes

Bump to version 8.0

Browse Source 
Change-Id: I344d0c11df73fbeaf98058e6490574ae1f7ef2d1
This commit is contained in:
Sergey Kulanov 2015-09-03 12:38:02 +03:00
parent 375a5bfc93
commit 967e9a0daa
9 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/common.cfg
View File

@ -19,8 +19,8 @@ MIRROR_UBUNTU_HTTPDIR=$MIRROR_UBUNTU_DIR
# MOS Ubuntu packages # MOS Ubuntu packages
MIRROR_MOS_UBUNTU_HOST="mirror.fuel-infra.org" MIRROR_MOS_UBUNTU_HOST="mirror.fuel-infra.org"
MIRROR_MOS_UBUNTU_DIR="mirror/mos-repos/ubuntu/7.0" MIRROR_MOS_UBUNTU_DIR="mirror/mos-repos/ubuntu/8.0"
MIRROR_MOS_UBUNTU_HTTPDIR="mos-repos/ubuntu/7.0" MIRROR_MOS_UBUNTU_HTTPDIR="mos-repos/ubuntu/8.0"
# Configure repository paths # Configure repository paths
# Format: # Format:

4
config/config.mk
View File

@ -19,7 +19,7 @@ LOCAL_MIRROR:=$(abspath $(LOCAL_MIRROR))
DEPS_DIR?=$(TOP_DIR)/deps DEPS_DIR?=$(TOP_DIR)/deps
DEPS_DIR:=$(abspath $(DEPS_DIR)) DEPS_DIR:=$(abspath $(DEPS_DIR))
PRODUCT_VERSION:=7.0 PRODUCT_VERSION:=8.0
# This variable is used for naming of auxillary objects # This variable is used for naming of auxillary objects
# related to product: repositories, mirrors etc # related to product: repositories, mirrors etc
@ -211,7 +211,7 @@ MIRROR_UBUNTU_SUITE?=$(UBUNTU_RELEASE)
MIRROR_UBUNTU_SECTION?=main universe multiverse restricted MIRROR_UBUNTU_SECTION?=main universe multiverse restricted
MIRROR_MOS_UBUNTU_METHOD?=http MIRROR_MOS_UBUNTU_METHOD?=http
MIRROR_MOS_UBUNTU?=perestroika-repo-tst.infra.mirantis.net MIRROR_MOS_UBUNTU?=perestroika-repo-tst.infra.mirantis.net
MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/ubuntu/7.0 MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/ubuntu/$(PRODUCT_VERSION)
MIRROR_MOS_UBUNTU_SUITE?=$(PRODUCT_NAME)$(PRODUCT_VERSION) MIRROR_MOS_UBUNTU_SUITE?=$(PRODUCT_NAME)$(PRODUCT_VERSION)
MIRROR_MOS_UBUNTU_SECTION?=main restricted MIRROR_MOS_UBUNTU_SECTION?=main restricted
MIRROR_DOCKER?=http://mirror.fuel-infra.org/fwm/$(PRODUCT_VERSION)/docker MIRROR_DOCKER?=http://mirror.fuel-infra.org/fwm/$(PRODUCT_VERSION)/docker

2
config/fuel.cfg
View File

@ -3,7 +3,7 @@
if ! hash fuel2 2>/dev/null; then if ! hash fuel2 2>/dev/null; then
# working outside of Fuel node, set Fuel parameters manually # working outside of Fuel node, set Fuel parameters manually
FUEL_VERSION=7.0 FUEL_VERSION=8.0
FUEL_SERVER="<specify_Fuel_server_IP_here>" FUEL_SERVER="<specify_Fuel_server_IP_here>"
# -------------------------------------- # --------------------------------------

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
fuel-createmirror (8.0-1) experimental; urgency=low
* Thu Sep 03 2015 skulanov <skulanov@mirantis.com>
- Bump to version 8.0
-- skulanov <skulanov@mirantis.com> Thu, 03 Sep 2015 12:35:26 +0300
fuel-createmirror (7.0-2) experimental; urgency=low fuel-createmirror (7.0-2) experimental; urgency=low
* Thu Aug 13 2015 vparakhin <vparakhin@mirantis.com> * Thu Aug 13 2015 vparakhin <vparakhin@mirantis.com>

14
debian/conffiles vendored
View File

@ -1,7 +1,7 @@
/opt/fuel-createmirror-7.0/config/common.cfg /opt/fuel-createmirror-8.0/config/common.cfg
/opt/fuel-createmirror-7.0/config/config.mk /opt/fuel-createmirror-8.0/config/config.mk
/opt/fuel-createmirror-7.0/config/fuel.cfg /opt/fuel-createmirror-8.0/config/fuel.cfg
/opt/fuel-createmirror-7.0/config/mos-ubuntu-updatesonly.cfg /opt/fuel-createmirror-8.0/config/mos-ubuntu-updatesonly.cfg
/opt/fuel-createmirror-7.0/config/mos-ubuntu.cfg /opt/fuel-createmirror-8.0/config/mos-ubuntu.cfg
/opt/fuel-createmirror-7.0/config/requirements-deb.txt /opt/fuel-createmirror-8.0/config/requirements-deb.txt
/opt/fuel-createmirror-7.0/config/ubuntu.cfg /opt/fuel-createmirror-8.0/config/ubuntu.cfg

4
debian/postinst vendored
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
ln -sf /opt/fuel-createmirror-7.0/fuel-createmirror /usr/bin/ ln -sf /opt/fuel-createmirror-8.0/fuel-createmirror /usr/bin/
ln -sf /opt/fuel-createmirror-7.0/config /etc/fuel-createmirror ln -sf /opt/fuel-createmirror-8.0/config /etc/fuel-createmirror

4
debian/postrm vendored
View File

@ -2,8 +2,8 @@
if [ "$1" = "1" ]; then if [ "$1" = "1" ]; then
rm -f /usr/bin/fuel-createmirror rm -f /usr/bin/fuel-createmirror
rm -f /etc/fuel-createmirror rm -f /etc/fuel-createmirror
ln -sf /opt/fuel-createmirror-7.0/fuel-createmirror /usr/bin/ ln -sf /opt/fuel-createmirror-8.0/fuel-createmirror /usr/bin/
ln -sf /opt/fuel-createmirror-7.0/config /etc/fuel-createmirror ln -sf /opt/fuel-createmirror-8.0/config /etc/fuel-createmirror
else else
rm -f /usr/bin/fuel-createmirror rm -f /usr/bin/fuel-createmirror
rm -f /etc/fuel-createmirror rm -f /etc/fuel-createmirror

4
debian/rules vendored
View File

@ -24,9 +24,9 @@ binary-arch: build
dh_installchangelogs dh_installchangelogs
# Copy the packages's files. # Copy the packages's files.
mkdir -p debian/$(PACKAGE)/opt/$(PACKAGE)-7.0 mkdir -p debian/$(PACKAGE)/opt/$(PACKAGE)-8.0
find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \ find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \
xargs -0 -r -i cp -a {} debian/$(PACKAGE)/opt/$(PACKAGE)-7.0 xargs -0 -r -i cp -a {} debian/$(PACKAGE)/opt/$(PACKAGE)-8.0
# #
# If you need to move files around in debian/$(PACKAGE) or do some # If you need to move files around in debian/$(PACKAGE) or do some

7
specs/fuel-createmirror.spec
View File

@ -1,6 +1,6 @@
%define name fuel-createmirror %define name fuel-createmirror
%{!?version: %define version 7.0} %{!?version: %define version 8.0}
%{!?release: %define release 2} %{!?release: %define release 1}
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -69,6 +69,9 @@ fi
/opt/%{name}-%{version}/README.md /opt/%{name}-%{version}/README.md
%changelog %changelog
* Thu Sep 03 2015 Sergey Kulanov <skulanov@mirantis.com>
- Bump to version 8.0
* Thu Aug 13 2015 vparakhin <vparakhin@mirantis.com> * Thu Aug 13 2015 vparakhin <vparakhin@mirantis.com>
- Switch MOS DEB repos to new format, update configs from fuel-main - Switch MOS DEB repos to new format, update configs from fuel-main