openstack
/
fuel-library
Code Issues Proposed changes

Bump version to 9.0 

Set openstack version to 2016.1.0-9.0 for now.
Proper versioning for 9.0 release is to be defined later.

Related patch to fuel-web:

https://review.openstack.org/#/c/259059/

Fuel-CI: disable

Change-Id: Iec9da695c4b240fc4e1cc1231ae6e4724311054c
This commit is contained in:
Sergey Kulanov 2015-12-18 15:14:50 +02:00
parent 20f84b01fa
commit 8b70b540c3
20 changed files with 97 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
fuel-library9.0 (9.0.0-1) trusty; urgency=low
* Bump version to 9.0
-- Sergey Kulanov <skulanov@mirantis.com> Fri, 18 Dec 2015 22:50:58 +0200
fuel-library8.0 (8.0.0-1ubuntu1) mos8.0; urgency=medium
* Bump version to 8.0

2
debian/control vendored
View File

@ -1,4 +1,4 @@
Source: fuel-library8.0
Source: fuel-library9.0
Section: admin
Priority: optional
Maintainer: Mirantis Product <product@mirantis.com>

2
deployment/puppet/docker/spec/classes/docker_spec.rb
View File

@ -20,7 +20,7 @@ describe 'docker' do
context 'with valid params' do
let :params do
default_params.merge!({
:release => '8.0',
:release => '9.0',
:dependent_dirs => ["/var/log/docker-logs", "/var/log/docker-logs/remote",
"/var/log/docker-logs/audit", "/var/log/docker-logs/cobbler",
"/var/log/docker-logs/ConsoleKit", "/var/log/docker-logs/coredump",

2
deployment/puppet/nailgun/lib/facter/fuel_openstack_version.rb
View File

@ -6,7 +6,7 @@ fuel_openstack_version_path = '/etc/fuel_openstack_version'
# deployment tests use the ISO where this file is not
# installed. This default value should be removed
# once the ISO is updated.
read_data = "2015.1.0-8.0"
read_data = "2016.1.0-9.0"
Facter.add('fuel_openstack_version') do
if File.exist?(fuel_openstack_version_path)

2
deployment/puppet/nailgun/lib/facter/fuel_release.rb
View File

@ -6,7 +6,7 @@ fuel_release_path = '/etc/fuel_release'
# deployment tests use the ISO where this file is not
# installed. This default value should be removed
# once the ISO is updated.
read_data = "8.0"
read_data = "9.0"
Facter.add('fuel_release') do
if File.exist?(fuel_release_path)

8
specs/fuel-library8.0.spec → specs/fuel-library9.0.spec
View File

@ -1,6 +1,6 @@
%define name fuel-library8.0
%{!?version: %define version 8.0.0}
%{!?fuel_release: %define fuel_release 8.0}
%define name fuel-library9.0
%{!?version: %define version 9.0.0}
%{!?fuel_release: %define fuel_release 9.0}
%{!?release: %define release 1}
%{!?rhel: %define rhel 7}
@ -24,7 +24,7 @@ Requires: fuel-misc python-fuelclient
%define files_source %{_builddir}/%{name}-%{version}/files
%define dockerctl_source %{files_source}/fuel-docker-utils
%define openstack_version 2015.1.0-8.0
%define openstack_version 2016.1.0-9.0
%define predefined_upstream_modules %{_sourcedir}/upstream_modules.tar.gz
%description

4
tests/noop/astute.yaml/facts/master.facts.yaml
View File

@ -1,3 +1,3 @@
# these facts are needed for old-style manifests with $::fuel_settings
astute_settings_yaml: "\"HOSTNAME\": \"nailgun\"\n\"DNS_DOMAIN\": \"test.domain.local\"\n\"DNS_SEARCH\": \"test.domain.local\"\n\"DNS_UPSTREAM\": \"10.109.0.1\"\n\"NTP1\": \"0.fuel.pool.ntp.org\"\n\"NTP2\": \"1.fuel.pool.ntp.org\"\n\"NTP3\": \"2.fuel.pool.ntp.org\"\n\"ADMIN_NETWORK\":\n \"interface\": \"eth0\"\n \"ipaddress\": \"10.109.0.2\"\n \"netmask\": \"255.255.255.0\"\n \"cidr\": \"10.20.0.0/24\"\n \"size\": \"256\"\n \"dhcp_gateway\": \"10.109.0.1\"\n \"dhcp_pool_start\": \"10.109.0.3\"\n \"dhcp_pool_end\": \"10.109.0.254\"\n \"mac\": \"64:60:46:2e:5d:37\"\n\"FUEL_ACCESS\":\n \"user\": \"admin\"\n \"password\": \"admin\"\n\"BOOTSTRAP\":\n \"MIRROR_DISTRO\": \"http://archive.ubuntu.com/ubuntu\"\n \"MIRROR_MOS\": \"http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0\"\n \"HTTP_PROXY\": \"\"\n \"EXTRA_APT_REPOS\": \"\"\n \"flavor\": \"centos\"\n\"PRODUCTION\": \"docker\"\n\"postgres\":\n \"keystone_dbname\": \"keystone\"\n \"nailgun_user\": \"nailgun\"\n \"keystone_user\": \"keystone\"\n \"nailgun_password\": \"CYoU6RS6\"\n \"ostf_user\": \"ostf\"\n \"nailgun_dbname\": \"nailgun\"\n \"keystone_password\": \"cpppakUb\"\n \"ostf_dbname\": \"ostf\"\n \"ostf_password\": \"TwfzylM7\"\n\"cobbler\":\n \"password\": \"0mMXE4t8\"\n \"user\": \"cobbler\"\n\"astute\":\n \"password\": \"SwLCUx2H\"\n \"user\": \"naily\"\n\"keystone\":\n \"nailgun_user\": \"nailgun\"\n \"monitord_user\": \"monitord\"\n \"nailgun_password\": \"MtC5S2TN\"\n \"monitord_password\": \"9IR0gsgd\"\n \"ostf_user\": \"ostf\"\n \"admin_token\": \"ZoyxrMO6\"\n \"ostf_password\": \"7evzsSBv\"\n\"mcollective\":\n \"password\": \"PPMi1XT2\"\n \"user\": \"mcollective\"\n"
fuel_release: "8.0"
astute_settings_yaml: "\"HOSTNAME\": \"nailgun\"\n\"DNS_DOMAIN\": \"test.domain.local\"\n\"DNS_SEARCH\": \"test.domain.local\"\n\"DNS_UPSTREAM\": \"10.109.0.1\"\n\"NTP1\": \"0.fuel.pool.ntp.org\"\n\"NTP2\": \"1.fuel.pool.ntp.org\"\n\"NTP3\": \"2.fuel.pool.ntp.org\"\n\"ADMIN_NETWORK\":\n \"interface\": \"eth0\"\n \"ipaddress\": \"10.109.0.2\"\n \"netmask\": \"255.255.255.0\"\n \"cidr\": \"10.20.0.0/24\"\n \"size\": \"256\"\n \"dhcp_gateway\": \"10.109.0.1\"\n \"dhcp_pool_start\": \"10.109.0.3\"\n \"dhcp_pool_end\": \"10.109.0.254\"\n \"mac\": \"64:60:46:2e:5d:37\"\n\"FUEL_ACCESS\":\n \"user\": \"admin\"\n \"password\": \"admin\"\n\"BOOTSTRAP\":\n \"MIRROR_DISTRO\": \"http://archive.ubuntu.com/ubuntu\"\n \"MIRROR_MOS\": \"http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0\"\n \"HTTP_PROXY\": \"\"\n \"EXTRA_APT_REPOS\": \"\"\n \"flavor\": \"centos\"\n\"PRODUCTION\": \"docker\"\n\"postgres\":\n \"keystone_dbname\": \"keystone\"\n \"nailgun_user\": \"nailgun\"\n \"keystone_user\": \"keystone\"\n \"nailgun_password\": \"CYoU6RS6\"\n \"ostf_user\": \"ostf\"\n \"nailgun_dbname\": \"nailgun\"\n \"keystone_password\": \"cpppakUb\"\n \"ostf_dbname\": \"ostf\"\n \"ostf_password\": \"TwfzylM7\"\n\"cobbler\":\n \"password\": \"0mMXE4t8\"\n \"user\": \"cobbler\"\n\"astute\":\n \"password\": \"SwLCUx2H\"\n \"user\": \"naily\"\n\"keystone\":\n \"nailgun_user\": \"nailgun\"\n \"monitord_user\": \"monitord\"\n \"nailgun_password\": \"MtC5S2TN\"\n \"monitord_password\": \"9IR0gsgd\"\n \"ostf_user\": \"ostf\"\n \"admin_token\": \"ZoyxrMO6\"\n \"ostf_password\": \"7evzsSBv\"\n\"mcollective\":\n \"password\": \"PPMi1XT2\"\n \"user\": \"mcollective\"\n"
fuel_release: "9.0"

2
tests/noop/astute.yaml/master.yaml
View File

@ -42,7 +42,7 @@ test_tasks:
"password": "admin"
"BOOTSTRAP":
"MIRROR_DISTRO": "http://archive.ubuntu.com/ubuntu"
"MIRROR_MOS": "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
"MIRROR_MOS": "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0"
"HTTP_PROXY": ""
"EXTRA_APT_REPOS": ""
"flavor": "centos"

10
tests/noop/astute.yaml/neut_vlan.ceph.compute-ephemeral-ceph.yaml
View File

@ -121,8 +121,8 @@ syslog:
libvirt_type: qemu
host_uuid: '00000000-0000-0000-0000-000000000000'
puppet:
modules: rsync://10.122.10.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.122.10.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.122.10.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.122.10.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: sx2tGnw7
wsrep_password: qEYkmkV7
@ -198,7 +198,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
nomodeset
@ -402,7 +402,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.122.10.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.122.10.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -426,7 +426,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.122.10.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.122.10.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

10
tests/noop/astute.yaml/neut_vlan.ceph.controller-ephemeral-ceph.yaml
View File

@ -561,8 +561,8 @@ syslog:
label: Syslog
libvirt_type: qemu
puppet:
modules: rsync://10.122.10.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.122.10.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.122.10.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.122.10.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: sx2tGnw7
wsrep_password: qEYkmkV7
@ -638,7 +638,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
nomodeset
@ -832,7 +832,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.122.10.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.122.10.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -856,7 +856,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.122.10.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.122.10.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

26
tests/noop/astute.yaml/neut_vlan.cinder-block-device.compute.yaml
View File

@ -17,8 +17,8 @@ syslog:
libvirt_type: kvm
primary_controller: false
puppet:
modules: rsync://10.20.0.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.20.0.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.20.0.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.20.0.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: KAfHLQ6UllBAJstHfC7O4rJG
wsrep_password: XN1CXe7VRTjPxj8njhDe1ZHJ
@ -84,7 +84,7 @@ quantum_settings:
metadata:
metadata_proxy_shared_secret: G2Z2SPMC1POwic211LhtAmyl
use_vcenter: false
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
external_dns:
dns_list: 8.8.8.8
metadata:
@ -321,31 +321,31 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.20.0.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.20.0.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos8.0
suite: mos9.0
type: deb
- name: mos-updates
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1050
suite: mos8.0-updates
suite: mos9.0-updates
type: deb
- name: mos-security
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1050
suite: mos8.0-security
suite: mos9.0-security
type: deb
- name: mos-holdback
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1100
suite: mos8.0-holdback
suite: mos9.0-holdback
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.20.0.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.20.0.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb
@ -668,7 +668,7 @@ heat:
auth_encryption_key: 04259f638401c92892e9e07c868192cd
rabbit_password: qj2rOdV8gKDaze0X5lxa6JDQ
storage_network_range: 192.168.1.0/24
fuel_version: '8.0'
fuel_version: '9.0'
rabbit:
password: OBvWdwceobl4uQLgsZ4MPVTt
public_network_assignment:

10
tests/noop/astute.yaml/neut_vlan.compute.nossl.yaml
View File

@ -121,8 +121,8 @@ syslog:
libvirt_type: qemu
host_uuid: '00000000-0000-0000-0000-000000000000'
puppet:
modules: rsync://10.122.5.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.122.5.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.122.5.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.122.5.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: PBmaN2YX
wsrep_password: FsatnsoY
@ -198,7 +198,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
nomodeset
@ -432,7 +432,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.122.5.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.122.5.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -456,7 +456,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.122.5.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.122.5.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

10
tests/noop/astute.yaml/neut_vlan.compute.ssl.overridden.yaml
View File

@ -121,8 +121,8 @@ syslog:
libvirt_type: qemu
host_uuid: '00000000-0000-0000-0000-000000000000'
puppet:
modules: rsync://10.122.5.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.122.5.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.122.5.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.122.5.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: PBmaN2YX
wsrep_password: FsatnsoY
@ -198,7 +198,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
nomodeset
@ -430,7 +430,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.122.5.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.122.5.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -454,7 +454,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.122.5.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.122.5.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

10
tests/noop/astute.yaml/neut_vlan.compute.ssl.yaml
View File

@ -121,8 +121,8 @@ syslog:
libvirt_type: qemu
host_uuid: '00000000-0000-0000-0000-000000000000'
puppet:
modules: rsync://10.122.5.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.122.5.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.122.5.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.122.5.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: PBmaN2YX
wsrep_password: FsatnsoY
@ -198,7 +198,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
nomodeset
@ -430,7 +430,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.122.5.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.122.5.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -454,7 +454,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.122.5.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.122.5.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

26
tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml
View File

@ -122,8 +122,8 @@ syslog:
label: Syslog
libvirt_type: qemu
puppet:
modules: rsync://10.109.37.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.109.37.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.109.37.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.109.37.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: POvhJ6iQOcf9d4TCsul2ZRQI
wsrep_password: XV0HBh9vJSqHOp8782RZRBgU
@ -210,7 +210,7 @@ quantum_settings:
metadata:
metadata_proxy_shared_secret: IFcIv8CuNbllNccJs2bvcrkH
use_vcenter: false
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
metadata:
@ -368,31 +368,31 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.109.37.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.109.37.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos8.0
suite: mos9.0
type: deb
- name: mos-updates
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1050
suite: mos8.0-updates
suite: mos9.0-updates
type: deb
- name: mos-security
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1050
suite: mos8.0-security
suite: mos9.0-security
type: deb
- name: mos-holdback
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1100
suite: mos8.0-holdback
suite: mos9.0-holdback
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.109.37.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.109.37.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb
@ -653,7 +653,7 @@ heat:
auth_encryption_key: ce489de3a39996b694db7c8d4804a93d
rabbit_password: hN4hSVxhTei1ViFOfS5sbPv8
storage_network_range: 192.168.1.0/24
fuel_version: '8.0'
fuel_version: '9.0'
rabbit:
password: OLCrvt99FgutnBs63PeFJchF
public_network_assignment:

26
tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml
View File

@ -617,8 +617,8 @@ syslog:
label: Syslog
libvirt_type: qemu
puppet:
modules: rsync://10.109.37.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.109.37.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.109.37.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.109.37.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: POvhJ6iQOcf9d4TCsul2ZRQI
wsrep_password: XV0HBh9vJSqHOp8782RZRBgU
@ -705,7 +705,7 @@ quantum_settings:
metadata:
metadata_proxy_shared_secret: IFcIv8CuNbllNccJs2bvcrkH
use_vcenter: false
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
metadata:
@ -865,31 +865,31 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.109.37.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.109.37.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos8.0
suite: mos9.0
type: deb
- name: mos-updates
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1050
suite: mos8.0-updates
suite: mos9.0-updates
type: deb
- name: mos-security
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1050
suite: mos8.0-security
suite: mos9.0-security
type: deb
- name: mos-holdback
section: main restricted
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/
uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
priority: 1100
suite: mos8.0-holdback
suite: mos9.0-holdback
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.109.37.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.109.37.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb
@ -1173,7 +1173,7 @@ heat:
auth_encryption_key: ce489de3a39996b694db7c8d4804a93d
rabbit_password: hN4hSVxhTei1ViFOfS5sbPv8
storage_network_range: 192.168.1.0/24
fuel_version: '8.0'
fuel_version: '9.0'
rabbit:
password: OLCrvt99FgutnBs63PeFJchF
public_network_assignment:

10
tests/noop/astute.yaml/novanet_flat.compute-vmware-role.yaml
View File

@ -116,8 +116,8 @@ syslog:
label: Syslog
libvirt_type: qemu
puppet:
modules: rsync://10.109.5.2:/puppet/2015.1.0-8.0/modules/
manifests: rsync://10.109.5.2:/puppet/2015.1.0-8.0/manifests/
modules: rsync://10.109.5.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.109.5.2:/puppet/2016.1.0-9.0/manifests/
host_uuid: '00000000-0000-0000-0000-000000000000'
mysql:
root_password: 9aXGuMEH
@ -228,7 +228,7 @@ network_metadata:
ipaddr: 10.109.6.2
vrouter:
ipaddr: 10.109.7.3
openstack_version: 2015.1.0-8.0
openstack_version: 2016.1.0-9.0
public_vrouter_vip: 10.109.6.3
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
@ -363,7 +363,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.109.5.2:8080/2015.1.0-8.0/ubuntu/x86_64
uri: http://10.109.5.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -387,7 +387,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.109.5.2:8080/2015.1.0-8.0/ubuntu/auxiliary
uri: http://10.109.5.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

10
tests/noop/astute.yaml/novanet_vlan.compute-vmware-role.yaml
View File

@ -133,8 +133,8 @@ syslog:
label: Syslog
libvirt_type: qemu
puppet:
modules: rsync://10.109.0.2:/puppet/2015.1.0-7.0/modules/
manifests: rsync://10.109.0.2:/puppet/2015.1.0-7.0/manifests/
modules: rsync://10.109.0.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.109.0.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: 4t67JmJk
wsrep_password: vugKPCKR
@ -370,7 +370,7 @@ network_metadata:
- controller
- primary-controller
namespace: vrouter
openstack_version: 2015.1.0-7.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
nomodeset
@ -506,7 +506,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.109.0.2:8080/2015.1.0-7.0/ubuntu/x86_64
uri: http://10.109.0.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -530,7 +530,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.109.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary
uri: http://10.109.0.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

10
tests/noop/astute.yaml/novanet_vlan.primary-controller.vcenter.yaml
View File

@ -599,8 +599,8 @@ syslog:
label: Syslog
libvirt_type: qemu
puppet:
modules: rsync://10.109.0.2:/puppet/2015.1.0-7.0/modules/
manifests: rsync://10.109.0.2:/puppet/2015.1.0-7.0/manifests/
modules: rsync://10.109.0.2:/puppet/2016.1.0-9.0/modules/
manifests: rsync://10.109.0.2:/puppet/2016.1.0-9.0/manifests/
mysql:
root_password: 4t67JmJk
wsrep_password: vugKPCKR
@ -836,7 +836,7 @@ network_metadata:
- controller
- primary-controller
namespace: vrouter
openstack_version: 2015.1.0-7.0
openstack_version: 2016.1.0-9.0
kernel_params:
kernel: console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90
nomodeset
@ -972,7 +972,7 @@ repo_setup:
type: deb
- name: mos
section: main restricted
uri: http://10.109.0.2:8080/2015.1.0-7.0/ubuntu/x86_64
uri: http://10.109.0.2:8080/2016.1.0-9.0/ubuntu/x86_64
priority: 1050
suite: mos7.0
type: deb
@ -996,7 +996,7 @@ repo_setup:
type: deb
- name: Auxiliary
section: main restricted
uri: http://10.109.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary
uri: http://10.109.0.2:8080/2016.1.0-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

2
tests/noop/spec/hosts/master/host-only_spec.rb
View File

@ -11,7 +11,7 @@ describe manifest do
bootstrap_hash = {
'MIRROR_DISTRO' => "http://archive.ubuntu.com/ubuntu",
'MIRROR_MOS' => "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0",
'MIRROR_MOS' => "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0",
'HTTP_PROXY' => "",
'EXTRA_APT_REPOS' => "",
'flavor' => "centos"