From b5d17a9324ca7f47458ee5d9918efbaaf68e8667 Mon Sep 17 00:00:00 2001 From: Dmitry Pyzhov Date: Wed, 15 May 2013 16:37:41 +0400 Subject: [PATCH] Fuel-2.2 --- Makefile | 1 + bootstrap/module.mk | 5 +- config.mk | 30 ++-- fuel | 2 +- fuelweb_test/module.mk | 1 + mirror/centos/repo.mk | 14 +- mirror/centos/yum_repos.mk | 50 ++++-- nailgun/nailgun/task/task.py | 1 + .../templates/snippets/mcollective_conf.erb | 2 +- puppet/nailgun/manifests/supervisor.pp | 9 ++ puppet/osnailyfacter/examples/site.pp | 28 +++- puppet/osnailyfacter/manifests/cluster_ha.pp | 143 ++++++++++-------- .../osnailyfacter/manifests/cluster_simple.pp | 2 +- puppet/osnailyfacter/manifests/init.pp | 9 -- .../osnailyfacter/manifests/network_setup.pp | 2 +- requirements-rpm.txt | 65 ++++---- sandbox.mk | 9 +- 17 files changed, 233 insertions(+), 140 deletions(-) delete mode 100644 puppet/osnailyfacter/manifests/init.pp diff --git a/Makefile b/Makefile index c324ab6ff..53f85950e 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ help: @echo ' MIRROR_GEMS: $(MIRROR_GEMS)' @echo ' MIRROR_SRC: $(MIRROR_SRC)' @echo ' ISO_DIR/ISO_NAME: $(ISO_PATH)' + @echo ' ENV_NAME: $(ENV_NAME)' @echo @echo 'Available targets:' @echo ' all - build product' diff --git a/bootstrap/module.mk b/bootstrap/module.mk index 78d30faba..0d4d8bade 100644 --- a/bootstrap/module.mk +++ b/bootstrap/module.mk @@ -185,8 +185,9 @@ $(BUILD_DIR)/bootstrap/prepare-initram-root.done: \ # Removing temporary rpms (devel packages, they were needed to install gems) $(YUM) erase $(BOOTSTRAP_RPMS_GARBAGE) - # Disabling exim (it have been installed as a dependency) - sudo chroot $(INITRAMROOT) chkconfig exim off + # Disabling mail server (it have been installed as a dependency) + -sudo chroot $(INITRAMROOT) chkconfig exim off + -sudo chroot $(INITRAMROOT) chkconfig postfix off # Installing kernel modules find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name 'kernel-2.*' | xargs rpm2cpio | \ diff --git a/config.mk b/config.mk index 2eeb51207..7ae197f2e 100644 --- a/config.mk +++ b/config.mk @@ -44,20 +44,30 @@ BUILD_MIRROR_GEMS:=$(BUILD_DIR)/packages/gems USE_MIRROR?=srv08 ifeq ($(USE_MIRROR),srv08) YUM_REPOS?=proprietary -MIRROR_CENTOS?=http://srv08-srt.srt.mirantis.net/fwm/centos -MIRROR_EGGS?=http://srv08-srt.srt.mirantis.net/fwm/eggs -MIRROR_GEMS?=http://srv08-srt.srt.mirantis.net/fwm/gems -MIRROR_SRC?=http://srv08-srt.srt.mirantis.net/fwm/src +MIRROR_BASE?=http://srv08-srt.srt.mirantis.net/fwm +MIRROR_CENTOS?=$(MIRROR_BASE)/centos +MIRROR_EGGS?=$(MIRROR_BASE)/eggs +MIRROR_GEMS?=$(MIRROR_BASE)/gems +MIRROR_SRC?=$(MIRROR_BASE)/src endif ifeq ($(USE_MIRROR),msk) YUM_REPOS?=proprietary -MIRROR_CENTOS?=http://172.18.8.209/fwm/centos -MIRROR_EGGS?=http://172.18.8.209/fwm/eggs -MIRROR_GEMS?=http://172.18.8.209/fwm/gems -MIRROR_SRC?=http://172.18.8.209/fwm/src +MIRROR_BASE?=http://172.18.8.209/fwm +MIRROR_CENTOS?=$(MIRROR_BASE)/centos +MIRROR_EGGS?=$(MIRROR_BASE)/eggs +MIRROR_GEMS?=$(MIRROR_BASE)/gems +MIRROR_SRC?=$(MIRROR_BASE)/src +endif +ifeq ($(USE_MIRROR),msk2) +YUM_REPOS?=proprietary +MIRROR_BASE?=http://172.18.8.207/fwm +MIRROR_CENTOS?=$(MIRROR_BASE)/centos +MIRROR_EGGS?=$(MIRROR_BASE)/eggs +MIRROR_GEMS?=$(MIRROR_BASE)/gems +MIRROR_SRC?=$(MIRROR_BASE)/src endif -MIRROR_CENTOS?=http://mirror.yandex.ru/centos +MIRROR_CENTOS?=http://archive.kernel.org/centos MIRROR_CENTOS_OS_BASEURL:=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/os/$(CENTOS_ARCH) # It can be any a list of links (--find-links) or a pip index (--index-url). MIRROR_EGGS?=http://pypi.python.org/simple @@ -73,7 +83,7 @@ REQUIRED_SRCS:=$(shell grep -v ^\\s*\# $(SOURCE_DIR)/requirements-src.txt) # The actual name will be constracted wich prepending "yum_repo_" prefix. # Example: YUM_REPOS?=official epel => yum_repo_official and yum_repo_epel # will be used. -YUM_REPOS?=official epel fuel_folsom puppetlabs rpmforge devel_puppetlabs +YUM_REPOS?=official fuel_folsom_2_1 puppetlabs # Mirror of source packages. Bareword 'internet' is used to download packages # directly from the internet diff --git a/fuel b/fuel index 5e333105a..cc0af9588 160000 --- a/fuel +++ b/fuel @@ -1 +1 @@ -Subproject commit 5e333105ac93ed1f2a6bdef6ae52160a9ec01985 +Subproject commit cc0af9588552362565dcb64eb7e0a75b2bc0c6ec diff --git a/fuelweb_test/module.mk b/fuelweb_test/module.mk index cb9d64afc..658beb844 100644 --- a/fuelweb_test/module.mk +++ b/fuelweb_test/module.mk @@ -9,6 +9,7 @@ else NOFORWARD_CLI_ARG= endif +ENV_NAME?=integration ifeq ($(ENV_NAME),) ENV_NAME_CLI_ARG= else diff --git a/mirror/centos/repo.mk b/mirror/centos/repo.mk index 9a4d0c8a1..a70b865a1 100644 --- a/mirror/centos/repo.mk +++ b/mirror/centos/repo.mk @@ -1,5 +1,7 @@ include $(SOURCE_DIR)/mirror/centos/yum_repos.mk +.PHONY: show-yum-urls + $(BUILD_DIR)/mirror/centos/etc/yum.conf: $(call depv,yum_conf) $(BUILD_DIR)/mirror/centos/etc/yum.conf: export contents:=$(yum_conf) $(BUILD_DIR)/mirror/centos/etc/yum.conf: @@ -17,7 +19,7 @@ $(BUILD_DIR)/mirror/centos/etc/yum/pluginconf.d/priorities.conf: $(BUILD_DIR)/mirror/centos/etc/yum.repos.d/base.repo: $(call depv,YUM_REPOS) $(BUILD_DIR)/mirror/centos/etc/yum.repos.d/base.repo: \ - export contents:=$(foreach repo,$(YUM_REPOS),\n$(yum_repo_$(repo))) + export contents:=$(foreach repo,$(YUM_REPOS),\n$(yum_repo_$(repo))\n) $(BUILD_DIR)/mirror/centos/etc/yum.repos.d/base.repo: @mkdir -p $(@D) echo "$${contents}" > $@ @@ -40,6 +42,16 @@ $(BUILD_DIR)/mirror/centos/yum.done: \ $(REQUIRED_RPMS) $(ACTION.TOUCH) +show-yum-urls: \ + $(BUILD_DIR)/mirror/centos/yum-config.done \ + $(SOURCE_DIR)/requirements-rpm.txt + yum -c $(BUILD_DIR)/mirror/centos/etc/yum.conf clean all + rm -rf /var/tmp/yum-$$USER-*/ + yumdownloader --urls -q --resolve --archlist=$(CENTOS_ARCH) \ + -c $(BUILD_DIR)/mirror/centos/etc/yum.conf \ + --destdir=$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages \ + $(REQUIRED_RPMS) + $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml: \ export COMPSXML=$(shell wget -qO- $(MIRROR_CENTOS_OS_BASEURL)/repodata/repomd.xml | grep -m 1 '$(@F)' | awk -F'"' '{ print $$2 }') $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml: diff --git a/mirror/centos/yum_repos.mk b/mirror/centos/yum_repos.mk index fc7276069..bd4f317db 100644 --- a/mirror/centos/yum_repos.mk +++ b/mirror/centos/yum_repos.mk @@ -36,7 +36,7 @@ name=CentOS-$(CENTOS_RELEASE) - Extras #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=extras baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/extras/$(CENTOS_ARCH) gpgcheck=0 -enabled=1 +enabled=0 priority=10 [centosplus] @@ -44,7 +44,7 @@ name=CentOS-$(CENTOS_RELEASE) - Plus #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=centosplus baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/centosplus/$(CENTOS_ARCH) gpgcheck=0 -enabled=1 +enabled=0 priority=10 [contrib] @@ -52,7 +52,7 @@ name=CentOS-$(CENTOS_RELEASE) - Contrib #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=contrib baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/contrib/$(CENTOS_ARCH) gpgcheck=0 -enabled=1 +enabled=0 priority=10 endef @@ -66,19 +66,45 @@ enabled=1 priority=20 endef -define yum_repo_fuel_folsom -[openstack-epel-fuel] +define yum_repo_fuel_folsom_2_1 +[openstack-epel-fuel-2.1] name=Mirantis OpenStack Custom Packages -mirrorlist=http://download.mirantis.com/epel-fuel-folsom/mirror.internal.list +#mirrorlist=http://download.mirantis.com/epel-fuel-folsom-2.1/mirror.internal.list +baseurl=http://srv08-srt.srt.mirantis.net/centos-repo/epel-fuel-folsom-2.1/ gpgkey=https://fedoraproject.org/static/0608B895.txt - http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 - http://download.mirantis.com/epel-fuel-folsom/rabbit.key - http://download.mirantis.com/epel-fuel-folsom/mirantis.key -gpgcheck=0 + http://download.mirantis.com/epel-fuel-folsom-2.1/centos.key + http://download.mirantis.com/epel-fuel-folsom-2.1/epel.key + http://download.mirantis.com/epel-fuel-folsom-2.1/mirantis.key + http://download.mirantis.com/epel-fuel-folsom-2.1/mysql.key + http://download.mirantis.com/epel-fuel-folsom-2.1/rabbit.key +gpgcheck=1 enabled=1 priority=1 endef +define yum_repo_fuel_devel +[mash-epel-fuel-grizzly] +name=Epel Fuel Grizzly from Matt +baseurl=http://osci-koji.srt.mirantis.net/mash/epel-fuel-grizzly/x86_64/ +enabled=0 +gpgcheck=0 +priority=1 + +[mash-fuel-folsom] +name=Fuel Folsom from Matt +baseurl=http://osci-koji.srt.mirantis.net/mash/fuel-folsom/x86_64/ +enabled=0 +gpgcheck=0 +priority=1 + +[mash-fuel-grizzly-puppet27] +name=Puppet packages from Matt +baseurl=http://osci-koji.srt.mirantis.net/mash/epel-fuel-grizzly-puppet27/x86_64/ +enabled=0 +gpgcheck=0 +priority=1 +endef + define yum_repo_puppetlabs [puppetlabs] name=Puppet Labs Packages @@ -89,11 +115,11 @@ gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs priority=1 endef -define yum_repo_devel_puppetlabs +define yum_repo_puppetlabs_devel [devel_puppetlabs] name=Puppet Labs Packages baseurl=http://yum.puppetlabs.com/el/$(CENTOS_MAJOR)/devel/$(CENTOS_ARCH)/ -enabled=1 +enabled=0 gpgcheck=1 gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs priority=2 diff --git a/nailgun/nailgun/task/task.py b/nailgun/nailgun/task/task.py index 4c0b85a8d..aad69a0da 100644 --- a/nailgun/nailgun/task/task.py +++ b/nailgun/nailgun/task/task.py @@ -150,6 +150,7 @@ class DeploymentTask(object): logger.info("Assigning IP addresses to nodes..") netmanager.assign_ips(nodes_ids, "management") netmanager.assign_ips(nodes_ids, "public") + netmanager.assign_ips(nodes_ids, "storage") nodes_with_attrs = [] for n in nodes: diff --git a/puppet/cobbler/templates/snippets/mcollective_conf.erb b/puppet/cobbler/templates/snippets/mcollective_conf.erb index 0ab407805..b51441b02 100644 --- a/puppet/cobbler/templates/snippets/mcollective_conf.erb +++ b/puppet/cobbler/templates/snippets/mcollective_conf.erb @@ -5,7 +5,7 @@ main_collective = mcollective collectives = mcollective libdir = /usr/libexec/mcollective logfile = /var/log/mcollective.log -loglevel = info +loglevel = debug daemonize = 1 direct_addressing = 1 diff --git a/puppet/nailgun/manifests/supervisor.pp b/puppet/nailgun/manifests/supervisor.pp index 379881855..d4e9ed0e1 100644 --- a/puppet/nailgun/manifests/supervisor.pp +++ b/puppet/nailgun/manifests/supervisor.pp @@ -26,7 +26,16 @@ class nailgun::supervisor( require => [ Package["supervisor"], Service["rabbitmq-server"], + File["/var/log/nailgun"], + File["/var/log/naily"], ], } + file {"/var/log/nailgun": + ensure => directory, + owner => 'root', + group => 'root', + mode => 0755, + } + } diff --git a/puppet/osnailyfacter/examples/site.pp b/puppet/osnailyfacter/examples/site.pp index ad11cb140..1a5033dc4 100644 --- a/puppet/osnailyfacter/examples/site.pp +++ b/puppet/osnailyfacter/examples/site.pp @@ -9,6 +9,30 @@ $openstack_version = { tag("${deployment_id}::${::environment}") -node default { - include osnailyfacter +stage {'netconfig': + before => Stage['main'], +} + +stage {'openstack-firewall': + before => Stage['main'], + require => Stage['netconfig'], +} + +node default { + case $deployment_mode { + "singlenode": { include osnailyfacter::cluster_simple } + "multinode": { include osnailyfacter::cluster_simple } + "ha": { include osnailyfacter::cluster_ha } + } + + class {'osnailyfacter::network_setup': stage => 'netconfig'} + class {'openstack::firewall': stage => 'openstack-firewall'} + + # Workaround for fuel bug with firewall + firewall {'003 remote rabbitmq ': + sport => [ 4369, 5672, 41055, 55672, 61613 ], + proto => 'tcp', + action => 'accept', + require => Class['openstack::firewall'], + } } diff --git a/puppet/osnailyfacter/manifests/cluster_ha.pp b/puppet/osnailyfacter/manifests/cluster_ha.pp index 2fae1703f..0d337c62b 100644 --- a/puppet/osnailyfacter/manifests/cluster_ha.pp +++ b/puppet/osnailyfacter/manifests/cluster_ha.pp @@ -32,6 +32,14 @@ $swift_hash = parsejson($swift) $cinder_hash = parsejson($cinder) $access_hash = parsejson($access) +if $::hostname == $master_hostname { + $primary_proxy = true + $primary_controller = true +} else { + $primary_proxy = false + $primary_controller = false +} + $base_syslog_hash = parsejson($base_syslog) $base_syslog_rserver = { 'remote_type' => 'udp', @@ -72,54 +80,55 @@ class compact_controller { class { 'openstack::controller_ha': controller_public_addresses => $controller_public_addresses, controller_internal_addresses => $controller_internal_addresses, - internal_address => $internal_address, - public_interface => $public_interface, - internal_interface => $management_interface, - private_interface => $private_interface, - internal_virtual_ip => $management_vip, - public_virtual_ip => $public_vip, - master_hostname => $master_hostname, - floating_range => $floating_network_range, - fixed_range => $fixed_network_range, - multi_host => $multi_host, - network_manager => $network_manager, - num_networks => $num_networks, - network_size => $network_size, - network_config => $network_config, - verbose => $verbose, - auto_assign_floating_ip => $auto_assign_floating_ip, - mysql_root_password => $mysql_hash[root_password], - admin_email => $access_hash[email], - admin_user => $access_hash[user], - admin_password => $access_hash[password], - keystone_db_password => $keystone_hash[db_password], - keystone_admin_token => $keystone_hash[admin_token], - keystone_admin_tenant => $access_hash[tenant], - glance_db_password => $glance_hash[db_password], - glance_user_password => $glance_hash[user_password], - nova_db_password => $nova_hash[db_password], - nova_user_password => $nova_hash[user_password], - rabbit_password => $rabbit_hash[password], - rabbit_user => $rabbit_user, - rabbit_nodes => $controller_hostnames, - memcached_servers => $controller_hostnames, - export_resources => false, - glance_backend => $glance_backend, - swift_proxies => $controller_internal_addresses, - quantum => $quantum, - quantum_user_password => $quantum_user_password, - quantum_db_password => $quantum_db_password, - quantum_db_user => $quantum_db_user, - quantum_db_dbname => $quantum_db_dbname, - tenant_network_type => $tenant_network_type, - segment_range => $segment_range, - cinder => $use_cinder, - cinder_user_password => $cinder_hash[user_password], - cinder_db_password => $cinder_hash[db_password], - manage_volumes => false, - galera_nodes => $galera_nodes, - mysql_skip_name_resolve => true, - use_syslog => true, + internal_address => $internal_address, + public_interface => $public_interface, + internal_interface => $management_interface, + private_interface => $private_interface, + internal_virtual_ip => $management_vip, + public_virtual_ip => $public_vip, + primary_controller => $primary_controller, + floating_range => $floating_network_range, + fixed_range => $fixed_network_range, + multi_host => $multi_host, + network_manager => $network_manager, + num_networks => $num_networks, + network_size => $network_size, + network_config => $network_config, + verbose => $verbose, + auto_assign_floating_ip => $auto_assign_floating_ip, + mysql_root_password => $mysql_hash[root_password], + admin_email => $access_hash[email], + admin_user => $access_hash[user], + admin_password => $access_hash[password], + keystone_db_password => $keystone_hash[db_password], + keystone_admin_token => $keystone_hash[admin_token], + keystone_admin_tenant => $access_hash[tenant], + glance_db_password => $glance_hash[db_password], + glance_user_password => $glance_hash[user_password], + nova_db_password => $nova_hash[db_password], + nova_user_password => $nova_hash[user_password], + rabbit_password => $rabbit_hash[password], + rabbit_user => $rabbit_user, + rabbit_nodes => $controller_hostnames, + memcached_servers => $controller_hostnames, + export_resources => false, + glance_backend => $glance_backend, + swift_proxies => $controller_internal_addresses, + quantum => $quantum, + quantum_user_password => $quantum_user_password, + quantum_db_password => $quantum_db_password, + quantum_db_user => $quantum_db_user, + quantum_db_dbname => $quantum_db_dbname, + tenant_network_type => $tenant_network_type, + segment_range => $segment_range, + cinder => $use_cinder, + cinder_user_password => $cinder_hash[user_password], + cinder_iscsi_bind_addr => $internal_address, + cinder_db_password => $cinder_hash[db_password], + manage_volumes => false, + galera_nodes => $galera_nodes, + mysql_skip_name_resolve => true, + use_syslog => true, } class { "::rsyslog::client": @@ -142,17 +151,25 @@ class compact_controller { include osnailyfacter::test_controller class { compact_controller: } - class { 'openstack::swift::storage-node': - storage_type => 'loopback', - swift_zone => $uid, - swift_local_net_ip => $internal_address, + class { 'openstack::swift::storage_node': + storage_type => 'loopback', + swift_zone => $uid, + swift_local_net_ip => $internal_address, + master_swift_proxy_ip => $controller_internal_addresses[$master_hostname], + sync_rings => ! $primary_proxy + } + if $primary_proxy { + ring_devices {'all': + storages => parsejson($nodes) + } } class { 'openstack::swift::proxy': - swift_proxies => $controller_internal_addresses, - swift_master => $master_hostname, + swift_user_password => $swift_hash[user_password], + swift_proxies => $controller_internal_addresses, + primary_proxy => $primary_proxy, controller_node_address => $management_vip, swift_local_net_ip => $internal_address, - swift_user_password => $swift_hash[user_password], + master_swift_proxy_ip => $controller_internal_addresses[$master_hostname], } nova_config { 'DEFAULT/start_guests_on_host_boot': value => $start_guests_on_host_boot } nova_config { 'DEFAULT/use_cow_images': value => $use_cow_images } @@ -166,13 +183,13 @@ class compact_controller { img_name => "TestVM", } Class[glance::api] -> Class[openstack::img::cirros] - Class[openstack::swift::storage-node] -> Class[openstack::img::cirros] + Class[openstack::swift::storage_node] -> Class[openstack::img::cirros] Class[openstack::swift::proxy] -> Class[openstack::img::cirros] Service[swift-proxy] -> Class[openstack::img::cirros] } Class[osnailyfacter::network_setup] -> Class[openstack::controller_ha] - Class[osnailyfacter::network_setup] -> Class[openstack::swift::storage-node] + Class[osnailyfacter::network_setup] -> Class[openstack::swift::storage_node] Class[osnailyfacter::network_setup] -> Class[openstack::swift::proxy] } @@ -192,24 +209,26 @@ class compact_controller { rabbit_nodes => $controller_hostnames, rabbit_password => $rabbit_hash[password], rabbit_user => $rabbit_user, + rabbit_ha_virtual_ip => $management_vip, glance_api_servers => "${management_vip}:9292", vncproxy_host => $public_vip, verbose => $verbose, vnc_enabled => true, - cinder => $use_cinder, - cinder_user_password => $cinder_hash[user_password], - cinder_db_password => $cinder_hash[db_password], manage_volumes => false, nova_user_password => $nova_hash[user_password], cache_server_ip => $controller_hostnames, service_endpoint => $management_vip, + cinder => $use_cinder, + cinder_iscsi_bind_addr => $internal_address, + cinder_user_password => $cinder_hash[user_password], + cinder_db_password => $cinder_hash[db_password], + db_host => $management_vip, quantum => $quantum, quantum_host => $quantum_host, quantum_sql_connection => $quantum_sql_connection, quantum_user_password => $quantum_user_password, tenant_network_type => $tenant_network_type, segment_range => $segment_range, - db_host => $management_vip, use_syslog => true, } @@ -236,7 +255,7 @@ class compact_controller { rabbit_password => $rabbit_hash[password], rabbit_host => false, rabbit_nodes => $controller_hostnames, - volume_group => 'cinder-volumes', + volume_group => 'cinder', manage_volumes => true, enabled => true, auth_host => $service_endpoint, diff --git a/puppet/osnailyfacter/manifests/cluster_simple.pp b/puppet/osnailyfacter/manifests/cluster_simple.pp index 2145600aa..428261b9e 100644 --- a/puppet/osnailyfacter/manifests/cluster_simple.pp +++ b/puppet/osnailyfacter/manifests/cluster_simple.pp @@ -183,7 +183,7 @@ Exec { logoutput => true } rabbit_password => $rabbit_hash[password], rabbit_host => false, rabbit_nodes => [$controller_node_address], - volume_group => 'cinder-volumes', + volume_group => 'cinder', manage_volumes => true, enabled => true, auth_host => $service_endpoint, diff --git a/puppet/osnailyfacter/manifests/init.pp b/puppet/osnailyfacter/manifests/init.pp deleted file mode 100644 index 3675f79e3..000000000 --- a/puppet/osnailyfacter/manifests/init.pp +++ /dev/null @@ -1,9 +0,0 @@ -class osnailyfacter { - case $deployment_mode { - "singlenode": { include osnailyfacter::cluster_simple } - "multinode": { include osnailyfacter::cluster_simple } - "ha": { include osnailyfacter::cluster_ha } - } - - include osnailyfacter::network_setup -} diff --git a/puppet/osnailyfacter/manifests/network_setup.pp b/puppet/osnailyfacter/manifests/network_setup.pp index a9762fdfc..bf57e700e 100644 --- a/puppet/osnailyfacter/manifests/network_setup.pp +++ b/puppet/osnailyfacter/manifests/network_setup.pp @@ -29,7 +29,7 @@ define check_base_interfaces ( class osnailyfacter::network_setup ( interfaces = keys(parsejson($network_data)), - network_settings = parsejson($network_data) + network_settings = parsejson($network_data), ) { setup_interfaces{$interfaces: network_settings=>$network_settings} -> check_base_interfaces{$interfaces:} diff --git a/requirements-rpm.txt b/requirements-rpm.txt index 626a1b77c..747cff7a0 100644 --- a/requirements-rpm.txt +++ b/requirements-rpm.txt @@ -1,10 +1,10 @@ MySQL-client-5.5.28-6 -MySQL-client-wsrep-5.5.28_wsrep_23.7-11 +MySQL-client-wsrep-5.5.28_wsrep_23.7-12 MySQL-python-1.2.3-0.3.c1.2.el6 MySQL-server-5.5.28-6 -MySQL-server-wsrep-5.5.28_wsrep_23.7-11 +MySQL-server-wsrep-5.5.28_wsrep_23.7-12 MySQL-shared-5.5.28-6 -MySQL-shared-wsrep-5.5.28_wsrep_23.7-11 +MySQL-shared-wsrep-5.5.28_wsrep_23.7-12 authconfig-6.1.12-10.el6 autoconf-2.63-5.1.el6 automake-1.11.1-1.2.el6 @@ -12,10 +12,11 @@ avahi-0.6.25-11.el6 bind-utils-9.8.2-0.10.rc1.el6_3.6 byacc-1.9.20070509-7.el6 centos-release-6-3.el6.centos.9 -cirros-testvm-0.3.0-2 +cirros-testvm-0.3.0-3 cman-3.0.12.1-32.el6_3.2 cobbler-2.2.3-2.el6 cobbler-web-2.2.3-2.el6 +crmsh-1.2.5-55.2 cronie-1.4.4-7.el6 cronie-noanacron-1.4.4-7.el6 crontabs-1.10-33.el6 @@ -23,7 +24,7 @@ curl-7.19.7-26.el6_2.4 dhclient-4.1.1-31.0.1.P1.el6.centos.1 dmidecode-2.11-2.el6 dnsmasq-utils-2.48-6.el6 -euca2ools-1.3.1-12.el6 +euca2ools-2.1.1-2.el6 fence-agents-3.1.5-17.1.el6_3 flex-2.5.35-8.el6 galera-23.2.2-1.rhel5 @@ -31,31 +32,31 @@ gcc-4.4.6-4.el6 gcc-c++-4.4.6-4.el6 haproxy-1.4.19-1.el6 keepalived-1.2.4-1.el6 +librelp-0.1.1-4.1.el6 make-3.81-20.el6 man-1.6f-30.el6 memcached-1.4.4-3.el6 -mysql-5.1.66-2.el6_3 -mysql-devel-5.1.66-2.el6_3 -mysql-server-5.1.66-2.el6_3 -nginx-1.0.15-3.el6 -novnc-0.4-3.el6 +nginx-1.0.15-4.el6 +novnc-0.4-8.el6 ntp-4.2.4p8-2.el6.centos numpy-1.4.1-9.el6 openssh-clients-5.3p1-81.el6_3 openssh-server-5.3p1-81.el6_3 +openssl-devel-1.0.0-25.el6_3.1 openssl098e-0.9.8e-17.el6.centos.2 -openstack-cinder-2012.2-6.mira -openstack-dashboard-2012.2-3.el6 -openstack-glance-2012.2-2.el6 -openstack-keystone-2012.2-3.mira.el6 -openstack-nova-2012.2-6.mira -openstack-nova-novncproxy-0.4-3.el6 -openstack-swift-1.7.4-3.mira -openstack-swift-account-1.7.4-3.mira -openstack-swift-container-1.7.4-3.mira -openstack-swift-object-1.7.4-3.mira -openstack-swift-proxy-1.7.4-3.mira -openstack-utils-2012.2-5.el6 +openstack-cinder-2012.2.3.fuel2.0-mira.9 +openstack-dashboard-2012.2.3.fuel2.0-mira.4 +openstack-glance-2012.2.3.fuel2.0-mira.5 +openstack-keystone-2012.2.3.fuel2.0-mira.5 +openstack-nova-2012.2.3.fuel2.0.1.g427fca8-mira.2 +openstack-nova-novncproxy-0.4-8.el6 +openstack-swift-1.7.4.fuel2.0-mira.7 +openstack-swift-account-1.7.4.fuel2.0-mira.7 +openstack-swift-container-1.7.4.fuel2.0-mira.7 +openstack-swift-object-1.7.4.fuel2.0-mira.7 +openstack-swift-proxy-1.7.4.fuel2.0-mira.7 +openstack-utils-2013.1-1.el6 +pacemaker-1.1.8-1.el6 patch-2.6-6.el6 policycoreutils-2.0.83-19.24.el6 postgresql-8.4.13-1.el6_3 @@ -68,39 +69,34 @@ puppetdb-1.0.5-1.el6 puppetdb-terminus-1.0.5-1.el6 python-amqp-1.2.0-6.el6 python-argparse-1.2.1-2.el6 -python-cinder-2012.2-6.mira +python-cinder-2012.2.3.fuel2.0-mira.9 python-devel-2.6.6-29.el6_3.3 -python-keystone-2012.2-3.mira.el6 -python-novaclient-2.9.0-1.el6 +python-keystone-2012.2.3.fuel2.0-mira.5 +python-novaclient-2.10.0.fuel2.0-mira.6 python-pip-0.8-1.el6 python-setuptools-0.6.10-3.el6 -python-virtualenv-1.7-1.el6 -qemu-0.15.0-1.el6.rfx +python-virtualenv-1.7.2-1.el6 qemu-img-0.12.1.2-2.295.el6_3.10 qemu-kvm-0.12.1.2-2.295.el6_3.10 rabbitmq-server-2.8.7-2.el6 rpm-build-4.8.0-27.el6 rsyslog-5.8.10-2.el6 rsyslog-relp-5.8.10-2.el6 -rsyslog-gssapi-5.8.10-2.el6 -rsyslog-snmp-5.8.10-2.el6 -rsyslog-gnutls-5.8.10-2.el6 -librelp-0.1.1-4.1.el6 ruby-1.8.7.352-7.el6_2 ruby-augeas-0.4.1-1.el6 ruby-devel-1.8.7.352-7.el6_2 -ruby-mysql-2.8.2-1.el6 ruby-rdoc-1.8.7.352-7.el6_2 ruby-ri-1.8.7.352-7.el6_2 ruby-shadow-1.4.1-13.el6 rubygem-mongrel-1.1.5-3.el6 -rubygem-stomp-1.2.2-1.el6 +rubygem-rake-0.8.7-2.1.el6 +rubygem-stomp-1.2.8-1.el6 rubygems-1.3.7-1.el6 scapy-2.0.0.10-5.el6 screen-4.0.3-16.el6 selinux-policy-targeted-3.7.19-154.el6 socat-1.7.2.1-1.el6 -supervisor-2.1-8.el6 +supervisor-3.0a12-0.12.el6 syslinux-4.02-8.el6 system-config-firewall-base-1.2.27-5.el6 tcpdump-4.0.0-3.20090921gitdf3cb4.2.el6 @@ -111,3 +107,4 @@ wget-1.12-1.4.el6 xfsprogs-3.1.1-7.el6 xinetd-2.3.14-35.el6_3 yum-3.2.29-30.el6.centos +zlib-devel-1.2.3-27.el6 diff --git a/sandbox.mk b/sandbox.mk index 55bf4ec6a..e9c218a7a 100644 --- a/sandbox.mk +++ b/sandbox.mk @@ -30,17 +30,18 @@ SANDBOX_PACKAGES:=\ glibc-headers \ kernel-headers \ make \ + openssl-devel \ + postgresql-devel \ python-devel.x86_64 \ python-pip \ rpm-build \ - tar \ - postgresql-devel \ - openssl-devel \ ruby \ ruby-devel \ - rubygems \ rubygem-rake \ + rubygems \ + tar \ which \ + zlib-devel define SANDBOX_UP