diff --git a/deployment/puppet/ceph/README.md b/deployment/puppet/ceph/README.md index 223bb00c88..bbba3638f5 100644 --- a/deployment/puppet/ceph/README.md +++ b/deployment/puppet/ceph/README.md @@ -1,11 +1,11 @@ -Mirantis Puppet module for Ceph +Fuel Puppet module for Ceph =============================== About ----- This is a Puppet module to install a Ceph cluster inside of OpenStack. This -module has been developed specifically to work with Mirantis Fuel for +module has been developed specifically to work with Fuel for OpenStack. * Puppet: http://www.puppetlabs.com/ diff --git a/deployment/puppet/ceph/manifests/radosgw.pp b/deployment/puppet/ceph/manifests/radosgw.pp index e122b3573d..32300e8c93 100644 --- a/deployment/puppet/ceph/manifests/radosgw.pp +++ b/deployment/puppet/ceph/manifests/radosgw.pp @@ -100,7 +100,7 @@ class ceph::radosgw ( ssh ${primary_mon} '/etc/init.d/radosgw restart'", } exec {"generate SSL certificate on ${name}": - command => "openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${httpd_ssl}apache.key -out ${httpd_ssl}apache.crt -subj '/C=RU/ST=Russia/L=Saratov/O=Mirantis/OU=CA/CN=localhost'", + command => "openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${httpd_ssl}apache.key -out ${httpd_ssl}apache.crt -subj '/C=RU/ST=Russia/L=Saratov/O=Fuel/OU=CA/CN=localhost'", returns => [0,1], } } diff --git a/deployment/puppet/cluster/Modulefile b/deployment/puppet/cluster/Modulefile index fb035bfaac..05a8430962 100644 --- a/deployment/puppet/cluster/Modulefile +++ b/deployment/puppet/cluster/Modulefile @@ -1 +1 @@ -name 'Mirantis-cluster' \ No newline at end of file +name 'Fuel-cluster' diff --git a/deployment/puppet/cluster/manifests/neutron.pp b/deployment/puppet/cluster/manifests/neutron.pp index 2370016c9d..ce5c3ba5e2 100644 --- a/deployment/puppet/cluster/manifests/neutron.pp +++ b/deployment/puppet/cluster/manifests/neutron.pp @@ -2,8 +2,6 @@ class cluster::neutron () { - Package['pacemaker'] -> - File<| title == 'ocf-mirantis-path' |> -> Package['neutron'] -> file {'/var/cache/neutron': diff --git a/deployment/puppet/cobbler/Modulefile b/deployment/puppet/cobbler/Modulefile index 821a8d227e..aaade89f26 100644 --- a/deployment/puppet/cobbler/Modulefile +++ b/deployment/puppet/cobbler/Modulefile @@ -1,8 +1,8 @@ name 'cobbler' version '0.0.1' -source 'https://github.com/Mirantis/recipes-library/cobbler' +source 'https://github.com/openstack/fuel-library' author 'Mirantis Inc.' license 'Apache License 2.0' -summary 'Mirantis Cobbler Module' +summary 'Fuel Cobbler Module' description 'Module to install cobbler provisioning system' -project_page 'https://github.com/Mirantis/recipes-library' +project_page 'https://github.com/openstack/fuel-library' diff --git a/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp b/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp index 7452774705..19982dae14 100644 --- a/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp +++ b/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp @@ -42,11 +42,11 @@ class cobbler::profile::centos63_x86_64( # "url" => "http://archive.kernel.org/centos/6.3/os/x86_64", # }, { - "name" => "Mirantis-CentOS-minimal", + "name" => "Fuel-CentOS-minimal", "url" => "http://download.mirantis.com/centos-minimal", }, { - "name" => "Mirantis-epel-fuel-install", + "name" => "epel-fuel-install", "url" => "http://download.mirantis.com/epel-fuel-folsom-2.1", } ], diff --git a/deployment/puppet/cobbler/manifests/profile/centos64_x86_64.pp b/deployment/puppet/cobbler/manifests/profile/centos64_x86_64.pp index a68f2b22af..fb961b45c8 100644 --- a/deployment/puppet/cobbler/manifests/profile/centos64_x86_64.pp +++ b/deployment/puppet/cobbler/manifests/profile/centos64_x86_64.pp @@ -42,11 +42,11 @@ class cobbler::profile::centos64_x86_64( # "url" => "http://archive.kernel.org/centos/6.4/os/x86_64", # }, { - "name" => "Mirantis-CentOS", + "name" => "Fuel-CentOS", "url" => "http://download.mirantis.com/centos-6.4", }, { - "name" => "Mirantis-epel-fuel-install", + "name" => "epel-fuel-install", "url" => "http://download.mirantis.com/epel-fuel-grizzly-3.1", } ], diff --git a/deployment/puppet/cobbler/manifests/profile/ubuntu_1204_x86_64.pp b/deployment/puppet/cobbler/manifests/profile/ubuntu_1204_x86_64.pp index 71153065b1..47f7541985 100644 --- a/deployment/puppet/cobbler/manifests/profile/ubuntu_1204_x86_64.pp +++ b/deployment/puppet/cobbler/manifests/profile/ubuntu_1204_x86_64.pp @@ -26,9 +26,9 @@ class cobbler::profile::ubuntu_1204_x86_64( $distro = "ubuntu_1204_x86_64", $ks_repo = [ { - "name" => "Mirantis", + "name" => "Fuel", "url" => "http://download.mirantis.com/precise-grizzly-fuel-3.2/", - "key" => "http://download.mirantis.com/precise-grizzly-fuel-3.2/Mirantis.key", + "key" => "http://download.mirantis.com/precise-grizzly-fuel-3.2/Fuel.key", "release" => "precise", "repos" => "main", }, diff --git a/deployment/puppet/cobbler/manifests/profile/ubuntu_1404_x86_64.pp b/deployment/puppet/cobbler/manifests/profile/ubuntu_1404_x86_64.pp index 27893fa566..30c46029d3 100644 --- a/deployment/puppet/cobbler/manifests/profile/ubuntu_1404_x86_64.pp +++ b/deployment/puppet/cobbler/manifests/profile/ubuntu_1404_x86_64.pp @@ -26,9 +26,9 @@ class cobbler::profile::ubuntu_1404_x86_64( $distro = "ubuntu_1404_x86_64", $ks_repo = [ { - "name" => "Mirantis", + "name" => "Fuel", "url" => "http://download.mirantis.com/precise-grizzly-fuel-3.2/", - "key" => "http://download.mirantis.com/precise-grizzly-fuel-3.2/Mirantis.key", + "key" => "http://download.mirantis.com/precise-grizzly-fuel-3.2/Fuel.key", "release" => "trusty", "repos" => "main", }, diff --git a/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb b/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb index 1395cbb1e7..62280fcd55 100644 --- a/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb +++ b/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb @@ -137,7 +137,7 @@ d-i debian-installer/exit/poweroff boolean false # add network configuration d-i preseed/late_command string true && \ $SNIPPET('ubuntu_repos_late') -echo 'APT::Get::AllowUnauthenticated 1;' > /target/etc/apt/apt.conf.d/02mirantis-allow-unsigned && \ +echo 'APT::Get::AllowUnauthenticated 1;' > /target/etc/apt/apt.conf.d/02fuel-allow-unsigned && \ echo 'Acquire::ForceIPv4 "true";' > /target/etc/apt/apt.conf.d/03force-ipv4 && \ in-target apt-get update; \ in-target apt-get upgrade -y; \ diff --git a/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb b/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb index 2ea608c929..fd6dda3641 100644 --- a/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb +++ b/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb @@ -141,7 +141,7 @@ d-i debian-installer/exit/poweroff boolean false # add network configuration d-i preseed/late_command string true && \ $SNIPPET('ubuntu_repos_late') -echo 'APT::Get::AllowUnauthenticated 1;' > /target/etc/apt/apt.conf.d/02mirantis-allow-unsigned && \ +echo 'APT::Get::AllowUnauthenticated 1;' > /target/etc/apt/apt.conf.d/02fuel-allow-unsigned && \ echo 'Acquire::ForceIPv4 "true";' > /target/etc/apt/apt.conf.d/03force-ipv4 && \ in-target apt-get update; \ in-target apt-get upgrade -y; \ diff --git a/deployment/puppet/galera/Modulefile b/deployment/puppet/galera/Modulefile index a0316851f2..88d74e2b7f 100644 --- a/deployment/puppet/galera/Modulefile +++ b/deployment/puppet/galera/Modulefile @@ -1,4 +1,4 @@ -name 'mirantis-galera' +name 'fuel-galera' version '0.0.1' source 'none' author '' diff --git a/deployment/puppet/mellanox_openstack/Modulefile b/deployment/puppet/mellanox_openstack/Modulefile index f2cbcb7bdd..7166ce3734 100644 --- a/deployment/puppet/mellanox_openstack/Modulefile +++ b/deployment/puppet/mellanox_openstack/Modulefile @@ -2,5 +2,5 @@ name 'mellanox-mellanox_openstack' version '1.0.0' author 'mellanox' license 'Apache License, Version 2.0' -summary 'Mellanox module for Mirantis Fuel Openstack deployment' -description 'This is a Puppet module to install Mellanox Openstack components over Mirantis Fuel' +summary 'Mellanox module for Fuel Openstack deployment' +description 'This is a Puppet module to install Mellanox Openstack components over Openstack Fuel' diff --git a/deployment/puppet/mellanox_openstack/README.md b/deployment/puppet/mellanox_openstack/README.md index ba908c192e..9c3a10c587 100644 --- a/deployment/puppet/mellanox_openstack/README.md +++ b/deployment/puppet/mellanox_openstack/README.md @@ -14,7 +14,7 @@ It configures the ml2 to work with Mellanox plugin, and installs and configures ### Setup Requirements -The module is designed to be used by Fuel (an openstack installer by Mirantis). +The module is designed to be used by Fuel (an openstack installer). ## Release Notes/Contributors/Etc diff --git a/deployment/puppet/mellanox_openstack/metadata.json b/deployment/puppet/mellanox_openstack/metadata.json index 7938e68945..d83920c0aa 100644 --- a/deployment/puppet/mellanox_openstack/metadata.json +++ b/deployment/puppet/mellanox_openstack/metadata.json @@ -2,7 +2,7 @@ "name": "mellanox-mellanox_openstack", "version": "5.1.0", "author": "mellanox", - "summary": "Mellanox module for supporting Mellanox hardware on Mirantis Fuel openstack deployment", + "summary": "Mellanox module for supporting Mellanox hardware on Fuel openstack deployment", "license": "Apache 2.0", "source": "", "issues_url": null, diff --git a/deployment/puppet/mysql/tests/server.pp b/deployment/puppet/mysql/tests/server.pp index 3e93db18c0..bf437853d7 100644 --- a/deployment/puppet/mysql/tests/server.pp +++ b/deployment/puppet/mysql/tests/server.pp @@ -1,5 +1,3 @@ -class { 'openstack::mirantis_repos': } - class { 'mysql::server': config_hash => { 'root_password' => 'password', @@ -44,7 +42,6 @@ database_user{ 'dan@%': require => Class['mysql::server'], } -Class['openstack::mirantis_repos'] -> Class['mysql::server'] Class['mysql::server'] -> Database <| |> Class['mysql::server'] -> Database_grant <| |> Class['mysql::server'] -> Database_user <| |> diff --git a/deployment/puppet/nailgun/manifests/nginx.pp b/deployment/puppet/nailgun/manifests/nginx.pp index 9bca8fb2e0..01de1ca9f1 100644 --- a/deployment/puppet/nailgun/manifests/nginx.pp +++ b/deployment/puppet/nailgun/manifests/nginx.pp @@ -61,7 +61,7 @@ class nailgun::nginx( openssl::certificate::x509 { 'nginx': ensure => present, country => 'US', - organization => 'Mirantis', + organization => 'Fuel', commonname => 'fuel.master.local', altnames => [$nailgun_host], state => 'California', diff --git a/deployment/puppet/openstack/manifests/mirantis_repos.pp b/deployment/puppet/openstack/manifests/mirantis_repos.pp deleted file mode 100644 index 569335f746..0000000000 --- a/deployment/puppet/openstack/manifests/mirantis_repos.pp +++ /dev/null @@ -1,222 +0,0 @@ -# -class openstack::mirantis_repos ( - # DO NOT change this value to 'defaults'. All our customers are relying on external repositories - $type = 'default', - $originator = 'Mirantis Product ', - $disable_puppet_labs_repos = true, - $upstream_mirror = true, - $deb_mirror = 'http://172.18.67.168/ubuntu-repo/mirror.yandex.ru/ubuntu', - $deb_updates = 'http://172.18.67.168/ubuntu-repo/mirror.yandex.ru/ubuntu', - $deb_security = 'http://172.18.67.168/ubuntu-repo/mirror.yandex.ru/ubuntu', - $deb_fuel_folsom_repo = 'http://172.18.67.168/ubuntu-repo/precise-fuel-folsom', - $deb_fuel_grizzly_repo = 'http://osci-gbp.srt.mirantis.net/ubuntu/fuel/', - $deb_cloud_archive_repo = 'http://172.18.67.168/ubuntu-cloud.archive.canonical.com/ubuntu', - $deb_rabbit_repo = 'http://172.18.67.168/ubuntu-repo/precise-fuel-folsom', - $enable_epel = false, - $fuel_mirrorlist = 'http://download.mirantis.com/epel-fuel-folsom-2.1/mirror.internal-stage.list', - $mirrorlist_base = 'http://172.18.67.168/centos-repo/mirror-6.3-os.list', - $mirrorlist_updates = 'http://172.18.67.168/centos-repo/mirror-6.3-updates.list', - $grizzly_baseurl = 'http://download.mirantis.com/epel-fuel-grizzly-3.1', - $enable_test_repo = false, - $repo_proxy = undef, - $use_upstream_mysql = false, -) { - case $::osfamily { - 'Debian' : { - class { 'apt::proxy': - proxy => $repo_proxy, - stage => $::openstack::mirantis_repos::stage - } - - apt::pin { 'mirantis-releases': - order => 20, - priority => 1001, - } - - if $use_upstream_mysql { - apt::pin { 'upstream-mysql': - order => 19, - priority => 1002, - releasecustom => "v=12.04,o=Ubuntu", - packages => "/^mysql/" - } - } - - Apt::Source <| |> -> Apt::Pin <| |> - - if $type == 'default' { - apt::source { 'mirantis-releases': - location => 'http://download.mirantis.com/precise-grizzly-fuel-3.2', - release => 'precise', - repos => 'main', - key => '3E301371', - key_source => 'http://download.mirantis.com/precise-grizzly-fuel-3.2/Mirantis.key', - include_src => false, - } - } - - # Below we set our internal repos for testing purposes. Some of them may match with external ones. - if $type == 'custom' { - apt::pin { 'mirantis-releases': - order => 19, - priority => 1001, - } - - apt::source { 'mirantis-releases': - location => 'http://172.18.67.168/ubuntu-repo/precise-grizzly-fuel-3.2', - release => 'precise', - repos => 'main', - key => '3E301371', - key_source => 'http://172.18.67.168/ubuntu-repo/precise-grizzly-fuel-3.2/Mirantis.key', - include_src => false, - } - - if $upstream_mirror == true { - file { '/etc/apt/sources.list': ensure => absent } - File['/etc/apt/sources.list'] -> Apt::Source <| |> - - apt::source { 'ubuntu-mirror': - location => $deb_mirror, - release => 'precise', - repos => 'main universe multiverse restricted', - } - - apt::source { 'ubuntu-updates': - location => $deb_updates, - release => 'precise-updates', - repos => 'main universe multiverse restricted', - } - - apt::source { 'ubuntu-security': - location => $deb_security, - release => 'precise-security', - repos => 'main universe multiverse restricted', - } - } - } - - if !defined(Class['apt::update']) { - class { 'apt::update': stage => $::openstack::mirantis_repos::stage } - } - - # In no one custom Debian repository is defined, it is necessary to force run apt-get update - # Please uncomment the following block to order puppet to force apt-get update - # ############### Start of forced apt-get update block ############## - # class { 'apt': - # always_apt_update => true, - # } - # ############### End of forced apt-get update block ############### - } - - 'RedHat': { - - Yumrepo { - proxy => $repo_proxy, - } - - # added internal (custom)/external (default) network mirror - if $type == 'default' { - - yumrepo { 'centos-base': - descr => 'Mirantis-CentOS-Base', - name => 'base', - baseurl => 'http://download.mirantis.com/centos-6.4', - gpgcheck => '1', - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - mirrorlist => absent, - } - - yumrepo { 'openstack-epel-fuel-grizzly': - descr => 'Mirantis OpenStack grizzly Custom Packages', - baseurl => 'http://download.mirantis.com/epel-fuel-grizzly-3.1', - gpgcheck => '1', - gpgkey => 'http://download.mirantis.com/epel-fuel-grizzly-3.1/mirantis.key', - mirrorlist => absent, - } - - # completely disable additional out-of-box repos - yumrepo { 'extras': - descr => 'CentOS-$releasever - Extras', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras', - gpgcheck => '1', - baseurl => absent, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - enabled => '0', - } - - yumrepo { 'updates': - descr => 'CentOS-$releasever - Updates', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates', - gpgcheck => '1', - baseurl => absent, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - enabled => '0', - } - } - - if $type == 'custom' { - - yumrepo { 'openstack-epel-fuel-grizzly': - descr => 'Mirantis OpenStack grizzly Custom Packages', - baseurl => 'http://download.mirantis.com/epel-fuel-grizzly-3.1', - gpgcheck => '0', - } - - if $upstream_mirror == true { - yumrepo { 'centos-base': - name => 'base', - gpgcheck => '1', - mirrorlist => $mirrorlist_base, - gpgkey => 'http://centos.srt.mirantis.net/RPM-GPG-KEY-CentOS-6', - } - - yumrepo { 'centos-updates': - name => 'updates', - gpgcheck => '1', - mirrorlist => $mirrorlist_updates, - gpgkey => 'http://centos.srt.mirantis.net/RPM-GPG-KEY-CentOS-6', - } - } - } - - if $enable_epel { - Yumrepo { - failovermethod => 'priority', - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - gpgcheck => 1, - enabled => 1, - } - yumrepo { 'epel-testing': - descr => 'Extra Packages for Enterprise Linux 6 - Testing - $basearch', - mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=testing-epel6&arch=$basearch', - enabled => 1, - } - - yumrepo { 'epel': - descr => 'Extra Packages for Enterprise Linux 6 - $basearch', - mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch', - } - } - - # Puppetlabs repos are really slow. This can slow deployment or even lead to yum timeout. - - if $disable_puppet_labs_repos { - if defined(Yumrepo['puppetlabs-products']) { - yumrepo { 'puppetlabs-products': enabled => 0 } - } - - if defined(Yumrepo['puppetlabs-deps']) { - yumrepo { 'puppetlabs-deps': enabled => 0 } - } - } - - exec { 'yum_make_safe_cache': command => "/usr/bin/yum clean all", } - Yumrepo <| |> -> Exec['yum_make_safe_cache'] - } - default : { - fail("Unsupported osfamily: ${osfamily} for os ${operatingsystem}") - } - } -} - - diff --git a/deployment/puppet/osnailyfacter/modular/astute/openssl.cnf b/deployment/puppet/osnailyfacter/modular/astute/openssl.cnf index 0b2b72a816..07180aeaee 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/openssl.cnf +++ b/deployment/puppet/osnailyfacter/modular/astute/openssl.cnf @@ -9,8 +9,8 @@ req_extensions = v3_req CN = US ST = California L = Mountain View -O = Mirantis -OU = Mirantis Deploy Team +O = Fuel +OU = Fuel Deploy Team [ v3_req ] basicConstraints = CA:FALSE diff --git a/deployment/puppet/pacemaker/spec/unit/puppet/provider/cib.xml b/deployment/puppet/pacemaker/spec/unit/puppet/provider/cib.xml index 91a5b73c6a..17c62f3614 100644 --- a/deployment/puppet/pacemaker/spec/unit/puppet/provider/cib.xml +++ b/deployment/puppet/pacemaker/spec/unit/puppet/provider/cib.xml @@ -26,7 +26,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -213,7 +213,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -297,22 +297,22 @@ - + - + - + - + - + @@ -320,34 +320,34 @@ - + - + - + - + - + - + - + @@ -365,47 +365,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -422,45 +422,45 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml b/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml index 43907cc22f..12b99f88d4 100644 --- a/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml @@ -398,7 +398,7 @@ repo_setup: type: deb - name: ironic section: main - uri: http://perestroika-repo-tst.infra.mirantis.net/review/CR-9495/mos-repos/ubuntu/ + uri: http://perestroika-repo-tst.infra.net/review/CR-9495/mos-repos/ubuntu/ priority: 1200 suite: mos7.0 type: deb diff --git a/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml b/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml index e4924e7be4..9b3a5569a2 100644 --- a/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml @@ -895,7 +895,7 @@ repo_setup: type: deb - name: ironic section: main - uri: http://perestroika-repo-tst.infra.mirantis.net/review/CR-9495/mos-repos/ubuntu/ + uri: http://perestroika-repo-tst.infra.net/review/CR-9495/mos-repos/ubuntu/ priority: 1200 suite: mos7.0 type: deb