Switch MOS DEB repos to new format, update configs from fuel-main

Change-Id: I49d389cbfce8ac6976a524e1de788485f12442e6
Closes-Bug: #1484434

config/common.cfg

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

config/config.mk

@@ -201,7 +201,7 @@ endif
 # will be used.
 YUM_REPOS?=official fuel subscr_manager
 MIRROR_CENTOS?=http://mirrors-local-msk.msk.mirantis.net/centos-$(PRODUCT_VERSION)/$(CENTOS_RELEASE)
-MIRROR_CENTOS_KERNEL?=http://mirror.centos.org/centos-6/6.6/
+MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
 SANDBOX_MIRROR_CENTOS_UPSTREAM?=http://mirrors-local-msk.msk.mirantis.net/centos-$(PRODUCT_VERSION)/$(CENTOS_RELEASE)
 SANDBOX_MIRROR_EPEL?=http://mirror.yandex.ru/epel/
 MIRROR_UBUNTU_METHOD?=http
@@ -243,3 +243,22 @@ PRODUCTION?=docker
 # Copy local /etc/ssl certs inside SANDBOX, which used for build deb mirror and packages.
 # This option should be enabled, in case you have to pass https repos for Ubuntu.
 SANDBOX_COPY_CERTS?=0
+
+# Development option only:
+# Please don’t change them if you don’t know what they do ##
+
+# If not empty, will try save "build/upgrade/deps" pip cache from upgrade module only,
+# to file  $(ARTS_DIR)/$(SAVE_UPGRADE_PIP_ART)
+# Example:
+# SAVE_UPGRADE_PIP_ART?=fuel-dev.art_pip_from_upg_module.tar.gz
+SAVE_UPGRADE_PIP_ART?=
+
+# If not empty, will try to download this archive and use like pip cache
+# for creating upgrade module.
+# Example:
+# USE_UPGRADE_PIP_ART_HTTP_LINK?=http://127.0.0.1/files/deps.pip.tar.gz
+# Content example:
+# deps.pip.tar.gz:\
+#  \argparse-1.2.1.tar.gz
+#  \docker-py-0.3.2.tar.gz
+USE_UPGRADE_PIP_ART_HTTP_LINK?=

config/requirements-deb.txt

@@ -42,6 +42,8 @@ dstat
 erlang-dev
 ethtool
 fence-agents
+fm10k-dkms
+fuel-agent
 fuel-utils
 galera
 git
@@ -78,6 +80,8 @@ libnss3-tools
 libssl0.9.8
 linux-firmware
 linux-firmware-nonfree
+live-boot
+live-boot-initramfs-tools
 lksctp-tools
 lldpad
 mc
@@ -89,10 +93,13 @@ memcached
 mongodb-clients
 mongodb-server
 monit
-murano
+msmtp-mta
+murano-api
 murano-dashboard
+murano-engine
 mysql-client
 mysql-server-wsrep-5.6
+nailgun-agent
 nailgun-mcagents
 nailgun-net-check
 neutron-common
@@ -140,14 +147,15 @@ nova-compute-kvm
 nova-compute-qemu
 nova-conductor
 nova-consoleauth
+nova-consoleproxy
 nova-network
-nova-novncproxy
 nova-objectstore
 nova-scheduler
 novnc
 ntp
 ohai
 openhpid
+openssh-client
 openssh-server
 openstack-dashboard
 openvswitch-switch
@@ -228,6 +236,7 @@ sahara-engine
 screen
 sheepdog
 socat
+squashfs-tools
 swift
 swift-account
 swift-container
@@ -247,6 +256,7 @@ vim
 virt-what
 vlan
 xinetd
+xz-utils
 zabbix-agent
 zabbix-frontend-php
 zabbix-server-mysql

debian/changelog

@@ -1,3 +1,9 @@
+fuel-createmirror (7.0-2) experimental; urgency=low
+
+  * Thu Aug 13 2015 vparakhin <vparakhin@mirantis.com>
+
+  - Switch MOS DEB repos to new format, update configs from fuel-main
+
 fuel-createmirror (7.0-1) experimental; urgency=low
 
   * Fri Aug 07 2015 skulanov <skulanov@mirantis.com>

specs/fuel-createmirror.spec

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

util/partial_ubuntu.sh

@@ -56,8 +56,8 @@ done
 
 cat <<EOF > ${apt_alt_etc}/preferences
 Package: *
-Pin: origin ${UPSTREAM}
-Pin-Priority: 1001
+Pin: release o=Mirantis
+Pin-Priority: 1101
 EOF
 
 if ! apt-get $apt_altstate_opts update; then