openstack
/
fuel-library
Code Issues Proposed changes

Change openstack_version to liberty-9.0 

Since there is no coordinated release version anymore, use Fuel version number
and OpenStack release name to construct path to Fuel Library modules for the
current release.

Fuel-CI: disable

Change-Id: I13a78d5ea6d9e1b04fe835fcc4d0c22625efb7a3
Related-bug: 1503663
Depends-on: Ifef952e18f08b98c430bbff9434984deaa68df81
This commit is contained in:
Oleg Gelbukh 2015-10-15 10:41:41 +00:00 committed by Sergii Golovatiuk
parent 3b0a727119
commit 8e24554e6d
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 = "2016.1.0-9.0"
read_data = "liberty-9.0"
Facter.add('fuel_openstack_version') do
if File.exist?(fuel_openstack_version_path)

2
specs/fuel-library9.0.spec
View File

@ -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 2016.1.0-9.0
%define openstack_version liberty-%{fuel_release}
%define predefined_upstream_modules %{_sourcedir}/upstream_modules.tar.gz
%description

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/2016.1.0-9.0/modules/
manifests: rsync://10.122.10.2:/puppet/2016.1.0-9.0/manifests/
modules: rsync://10.122.10.2:/puppet/liberty-9.0/modules/
manifests: rsync://10.122.10.2:/puppet/liberty-9.0/manifests/
mysql:
root_password: sx2tGnw7
wsrep_password: qEYkmkV7
@ -198,7 +198,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2016.1.0-9.0
openstack_version: liberty-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/2016.1.0-9.0/ubuntu/x86_64
uri: http://10.122.10.2:8080/liberty-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/2016.1.0-9.0/ubuntu/auxiliary
uri: http://10.122.10.2:8080/liberty-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/2016.1.0-9.0/modules/
manifests: rsync://10.122.10.2:/puppet/2016.1.0-9.0/manifests/
modules: rsync://10.122.10.2:/puppet/liberty-9.0/modules/
manifests: rsync://10.122.10.2:/puppet/liberty-9.0/manifests/
mysql:
root_password: sx2tGnw7
wsrep_password: qEYkmkV7
@ -638,7 +638,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2016.1.0-9.0
openstack_version: liberty-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/2016.1.0-9.0/ubuntu/x86_64
uri: http://10.122.10.2:8080/liberty-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/2016.1.0-9.0/ubuntu/auxiliary
uri: http://10.122.10.2:8080/liberty-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

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/2016.1.0-9.0/modules/
manifests: rsync://10.122.5.2:/puppet/2016.1.0-9.0/manifests/
modules: rsync://10.122.5.2:/puppet/liberty-9.0/modules/
manifests: rsync://10.122.5.2:/puppet/liberty-9.0/manifests/
mysql:
root_password: PBmaN2YX
wsrep_password: FsatnsoY
@ -198,7 +198,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2016.1.0-9.0
openstack_version: liberty-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/2016.1.0-9.0/ubuntu/x86_64
uri: http://10.122.5.2:8080/liberty-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/2016.1.0-9.0/ubuntu/auxiliary
uri: http://10.122.5.2:8080/liberty-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/2016.1.0-9.0/modules/
manifests: rsync://10.122.5.2:/puppet/2016.1.0-9.0/manifests/
modules: rsync://10.122.5.2:/puppet/liberty-9.0/modules/
manifests: rsync://10.122.5.2:/puppet/liberty-9.0/manifests/
mysql:
root_password: PBmaN2YX
wsrep_password: FsatnsoY
@ -198,7 +198,7 @@ management:
- controller
- primary-controller
namespace: haproxy
openstack_version: 2016.1.0-9.0
openstack_version: liberty-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/2016.1.0-9.0/ubuntu/x86_64
uri: http://10.122.5.2:8080/liberty-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/2016.1.0-9.0/ubuntu/auxiliary
uri: http://10.122.5.2:8080/liberty-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb

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/2016.1.0-9.0/modules/
manifests: rsync://10.109.5.2:/puppet/2016.1.0-9.0/manifests/
modules: rsync://10.109.5.2:/puppet/liberty-9.0/modules/
manifests: rsync://10.109.5.2:/puppet/liberty-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: 2016.1.0-9.0
openstack_version: liberty-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/2016.1.0-9.0/ubuntu/x86_64
uri: http://10.109.5.2:8080/liberty-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/2016.1.0-9.0/ubuntu/auxiliary
uri: http://10.109.5.2:8080/liberty-9.0/ubuntu/auxiliary
priority: 1150
suite: auxiliary
type: deb