From c447635a1520e02e6a8086293001b88e7a220be1 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Wed, 10 Jun 2015 02:07:22 +0100 Subject: [PATCH] add kilo updates, and latest configs from test rig --- reposync/centos.repo | 10 +++ reposync/foreman.repo | 1 + reposync/puppet.repo | 12 ---- reposync/rdo-openstack-beta.repo | 5 -- reposync/rdo-openstack.repo | 22 ++++++- xcat/osimages/c7-os-kilo-nova.osimage | 19 ++++++ xcat/osimages/c7-os-kilo.osimage | 18 +++++ xcat/templates/c7-os/common.tmpl | 2 +- .../controller.icehouse.otherpkgs.pkglist | 62 ++++++++++++++++++ .../c7-os/controller.juno.otherpkgs.pkglist | 10 ++- .../c7-os/controller.kilo.otherpkgs.pkglist | 65 +++++++++++++++++++ xcat/templates/c7-os/controller.pkglist | 9 +++ xcat/templates/c7-os/controller.synclist | 7 +- .../c7-os/nova.icehouse.otherpkgs.pkglist | 25 +++++++ .../c7-os/nova.juno.otherpkgs.pkglist | 2 + .../c7-os/nova.kilo.otherpkgs.pkglist | 25 +++++++ xcat/templates/c7-os/nova.pkglist | 5 ++ xcat/templates/c7-os/nova.synclist | 3 + 18 files changed, 272 insertions(+), 30 deletions(-) delete mode 100644 reposync/rdo-openstack-beta.repo create mode 100644 xcat/osimages/c7-os-kilo-nova.osimage create mode 100644 xcat/osimages/c7-os-kilo.osimage create mode 100644 xcat/templates/c7-os/controller.icehouse.otherpkgs.pkglist create mode 100644 xcat/templates/c7-os/controller.kilo.otherpkgs.pkglist create mode 100644 xcat/templates/c7-os/nova.icehouse.otherpkgs.pkglist create mode 100644 xcat/templates/c7-os/nova.kilo.otherpkgs.pkglist create mode 100644 xcat/templates/c7-os/nova.synclist diff --git a/reposync/centos.repo b/reposync/centos.repo index 9442179..637ae7a 100644 --- a/reposync/centos.repo +++ b/reposync/centos.repo @@ -16,6 +16,15 @@ baseurl=http://mirror.centos.org/centos/7/updates/x86_64 enabled=1 gpgcheck=0 +[updates-7.0] +name=CentOS Updates 7.0 +#baseurl=http://mirror.nsc.liu.se/centos-store/7.0.1406/updates/x86_64 +#baseurl=http://bay.uchicago.edu/centos-vault/7.0.1406/updates/x86_64 +#baseurl=http://mirror.symnds.com/distributions/CentOS-vault/7.0.1406/updates/x86_64/Packages +baseurl=http://archive.kernel.org/centos/7.0.1406/updates/x86_64 +enabled=1 +gpgcheck=0 + [updates-6] name=CentOS Updates 6 baseurl=http://mirror.centos.org/centos/6/updates/x86_64 @@ -27,3 +36,4 @@ name=CentOS SCL 6 baseurl=http://dev.centos.org/centos/6/SCL/x86_64/ enabled=1 gpgcheck=0 + diff --git a/reposync/foreman.repo b/reposync/foreman.repo index 7e52010..1ec117d 100644 --- a/reposync/foreman.repo +++ b/reposync/foreman.repo @@ -1,5 +1,6 @@ [foreman-6] name=Foreman for el 6 +#baseurl=http://yum.theforeman.org/releases/latest/el6/x86_64/ baseurl=http://yum.theforeman.org/releases/1.5/el6/x86_64/ enabled=1 gpgcheck=0 diff --git a/reposync/puppet.repo b/reposync/puppet.repo index 60a30bf..f1cb283 100644 --- a/reposync/puppet.repo +++ b/reposync/puppet.repo @@ -1,21 +1,9 @@ -[puppet-7] -name=Puppet EL 7 -baseurl=http://yum.puppetlabs.com/el/7/products/x86_64/ -enabled=1 -gpgcheck=0 - [puppet-6] name=Puppet EL 6 baseurl=http://yum.puppetlabs.com/el/6/products/x86_64/ enabled=1 gpgcheck=0 -[puppet-deps-7] -name=Puppet dependencies EL 7 -baseurl=http://yum.puppetlabs.com/el/7/dependencies/x86_64/ -enabled=1 -gpgcheck=0 - [puppet-deps-6] name=Puppet dependencies EL 6 baseurl=http://yum.puppetlabs.com/el/6/dependencies/x86_64/ diff --git a/reposync/rdo-openstack-beta.repo b/reposync/rdo-openstack-beta.repo deleted file mode 100644 index 9150d4e..0000000 --- a/reposync/rdo-openstack-beta.repo +++ /dev/null @@ -1,5 +0,0 @@ -[rdo-beta] -name=rdo-beta -baseurl=http://copr-be.cloud.fedoraproject.org/results/jruzicka/rdo-juno-epel-7/epel-7-x86_64/ -enabled=1 -gpgcheck=0 diff --git a/reposync/rdo-openstack.repo b/reposync/rdo-openstack.repo index f85c6d7..af997a2 100644 --- a/reposync/rdo-openstack.repo +++ b/reposync/rdo-openstack.repo @@ -1,10 +1,10 @@ -[rdo-openstack-epel-7] +[rdo-openstack-icehouse-epel-7] name=RDO OpenStack for EL 7 baseurl=https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/epel-7/ enabled=1 gpgcheck=0 -[rdo-openstack-epel-6] +[rdo-openstack-icehouse-epel-6] name=RDO OpenStack for EL 6 baseurl=https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/epel-6/ enabled=1 @@ -15,3 +15,21 @@ name=RDO OpenStack Juno for EL 7 baseurl=https://repos.fedorapeople.org/repos/openstack/openstack-juno/epel-7/ enabled=1 gpgcheck=0 + +[rdo-openstack-kilo-epel-7] +name=RDO OpenStack Kilo for EL 7 +baseurl=https://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7/ +enabled=1 +gpgcheck=0 + +[rdo-openstack-kilo-el-7] +name=RDO OpenStack Kilo for EL 7 +baseurl=https://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/ +enabled=1 +gpgcheck=0 + +[rdo-openstack-trunk-epel-7] +name=RDO OpenStack Trunk for EL 7 +baseurl=https://repos.fedorapeople.org/repos/openstack/openstack-trunk/epel-7/ +enabled=0 +gpgcheck=0 diff --git a/xcat/osimages/c7-os-kilo-nova.osimage b/xcat/osimages/c7-os-kilo-nova.osimage new file mode 100644 index 0000000..4c6332c --- /dev/null +++ b/xcat/osimages/c7-os-kilo-nova.osimage @@ -0,0 +1,19 @@ +# + +c7-os-kilo-nova: + objtype=osimage + groups=all + imagetype=linux + osarch=x86_64 + osname=Linux + osvers=centos7.1 + otherpkgdir=/install/post/otherpkgs/el7 + otherpkglist=/install/templates/c7-os/nova.kilo.otherpkgs.pkglist + partitionfile=/install/templates/c7-os/nova.partfile + pkgdir=/install/centos7.1/x86_64,/install/centos7.1/updates/x86_64 + pkglist=/install/templates/c7-os/nova.pkglist + postscripts=confignics -s,confignics + profile=nova + provmethod=install + synclists=/install/templates/c7-os/nova.synclist + template=/install/templates/c7-os/common.tmpl diff --git a/xcat/osimages/c7-os-kilo.osimage b/xcat/osimages/c7-os-kilo.osimage new file mode 100644 index 0000000..1cb34a5 --- /dev/null +++ b/xcat/osimages/c7-os-kilo.osimage @@ -0,0 +1,18 @@ +# + +c7-os-kilo: + objtype=osimage + imagetype=linux + osarch=x86_64 + osname=Linux + osvers=centos7.1 + otherpkgdir=/install/post/otherpkgs/el7 + otherpkglist=/install/templates/c7-os/controller.kilo.otherpkgs.pkglist + partitionfile=/install/templates/c7-os/controller.partfile + pkgdir=/install/centos7.1/x86_64,/install/centos7.1/updates/x86_64 + pkglist=/install/templates/c7-os/controller.pkglist + postscripts=confignics -s,confignics,setroute + profile=controller + provmethod=install + synclists=/install/templates/c7-os/controller.synclist + template=/install/templates/c7-os/common.tmpl diff --git a/xcat/templates/c7-os/common.tmpl b/xcat/templates/c7-os/common.tmpl index ae02fe2..135c0f2 100644 --- a/xcat/templates/c7-os/common.tmpl +++ b/xcat/templates/c7-os/common.tmpl @@ -91,7 +91,7 @@ text # # firewall # -#firewall --disabled +firewall --disabled # # Select a zone diff --git a/xcat/templates/c7-os/controller.icehouse.otherpkgs.pkglist b/xcat/templates/c7-os/controller.icehouse.otherpkgs.pkglist new file mode 100644 index 0000000..23c547c --- /dev/null +++ b/xcat/templates/c7-os/controller.icehouse.otherpkgs.pkglist @@ -0,0 +1,62 @@ +## PackStack/Puppet +puppet/puppet +rdo-openstack/openstack-packstack +rdo-openstack/openstack-puppet-modules +epel/erlang + +## Pre-reqs +rdo-openstack/mariadb-galera-server +rdo-openstack/rabbitmq-server + +## OpenStack Deps +rdo-openstack/openstack-utils +rdo-openstack/openstack-selinux + +## Nova +rdo-openstack/openstack-nova +rdo-openstack/openstack-nova-novncproxy +rdo-openstack/openstack-nova-console + +## Neutron +rdo-openstack/openstack-neutron +rdo-openstack/openstack-neutron-ml2 +rdo-openstack/openstack-neutron-openvswitch +rdo-openstack/openvswitch + +## Glance +rdo-openstack/openstack-glance + +## KeyStone +rdo-openstack/openstack-keystone + +## Swift +rdo-openstack/openstack-swift +rdo-openstack/openstack-swift-proxy +rdo-openstack/openstack-swift-object +rdo-openstack/openstack-swift-container +rdo-openstack/openstack-swift-account + +## Dashboard +rdo-openstack/openstack-dashboard + +## Telemetry +rdo-openstack/mongodb-server +rdo-openstack/openstack-ceilometer-* +rdo-openstack/python-ceilometer +rdo-openstack/python-ceilometerclient + +## Cinder +rdo-openstack/openstack-cinder + +## Heat +rdo-openstack/openstack-heat-api + +## Nagios +epel/nagios +epel/nagios-devel +epel/nagios-plugins* +epel/nrpe + +## Misc +epel/scsi-target-utils +extras/python-itsdangerous diff --git a/xcat/templates/c7-os/controller.juno.otherpkgs.pkglist b/xcat/templates/c7-os/controller.juno.otherpkgs.pkglist index f7c8c7f..127ee25 100644 --- a/xcat/templates/c7-os/controller.juno.otherpkgs.pkglist +++ b/xcat/templates/c7-os/controller.juno.otherpkgs.pkglist @@ -1,6 +1,5 @@ ## PackStack/Puppet epel/puppet -#puppet/puppet rdo-openstack-juno/openstack-packstack rdo-openstack-juno/openstack-puppet-modules epel/erlang @@ -52,11 +51,7 @@ rdo-openstack-juno/openstack-cinder ## Heat rdo-openstack-juno/openstack-heat-api rdo-openstack-juno/openstack-heat-api-cfn - -## Ironic -rdo-openstack-juno/openstack-ironic-api -rdo-openstack-juno/openstack-ironic-conductor -rdo-openstack-juno/python-ironicclient +rdo-openstack-juno/openstack-heat-engine ## Nagios epel/nagios @@ -68,3 +63,6 @@ epel/nrpe ## Misc epel/scsi-target-utils extras/python-itsdangerous + +misc-deps/percona-xtrabackup +epel/salt-minion diff --git a/xcat/templates/c7-os/controller.kilo.otherpkgs.pkglist b/xcat/templates/c7-os/controller.kilo.otherpkgs.pkglist new file mode 100644 index 0000000..a03f765 --- /dev/null +++ b/xcat/templates/c7-os/controller.kilo.otherpkgs.pkglist @@ -0,0 +1,65 @@ +## PackStack/Puppet +rdo-openstack-kilo/puppet +rdo-openstack-kilo/openstack-packstack +rdo-openstack-kilo/openstack-puppet-modules + +## Pre-reqs +rdo-openstack-kilo/mariadb-galera-server +rdo-openstack-kilo/rabbitmq-server + +## OpenStack Deps +rdo-openstack-kilo/openstack-utils +rdo-openstack-kilo/openstack-selinux + +## Nova +rdo-openstack-kilo/openstack-nova +rdo-openstack-kilo/openstack-nova-novncproxy +rdo-openstack-kilo/openstack-nova-console + +## Neutron +rdo-openstack-kilo/openstack-neutron +rdo-openstack-kilo/openstack-neutron-ml2 +rdo-openstack-kilo/openstack-neutron-openvswitch + +## Glance +rdo-openstack-kilo/openstack-glance + +## KeyStone +rdo-openstack-kilo/openstack-keystone + +## Swift +rdo-openstack-kilo/openstack-swift +rdo-openstack-kilo/openstack-swift-proxy +rdo-openstack-kilo/openstack-swift-object +rdo-openstack-kilo/openstack-swift-container +rdo-openstack-kilo/openstack-swift-account + +## Dashboard +rdo-openstack-kilo/openstack-dashboard + +## Telemetry +rdo-openstack-kilo/mongodb-server +rdo-openstack-kilo/openstack-ceilometer-* +rdo-openstack-kilo/python-ceilometer +rdo-openstack-kilo/python-ceilometerclient + +## Cinder +rdo-openstack-kilo/openstack-cinder + +## Heat +rdo-openstack-kilo/openstack-heat-api +rdo-openstack-kilo/openstack-heat-api-cfn +rdo-openstack-kilo/openstack-heat-engine + +## Nagios +rdo-openstack-kilo/nagios +rdo-openstack-kilo/nagios-devel +rdo-openstack-kilo/nagios-plugins-nrpe +rdo-openstack-kilo/nagios-plugins-ping +rdo-openstack-kilo/nrpe + +## Misc +misc-deps/percona-xtrabackup +epel/salt-minion + +extras/python-werkzeug diff --git a/xcat/templates/c7-os/controller.pkglist b/xcat/templates/c7-os/controller.pkglist index 21d97e7..bb7d522 100644 --- a/xcat/templates/c7-os/controller.pkglist +++ b/xcat/templates/c7-os/controller.pkglist @@ -1,11 +1,14 @@ #INCLUDE:/opt/xcat/share/xcat/install/rh/compute.rhel7.pkglist# +fence-agents-all gcc gd gd-devel glibc glibc.i686 glibc-common +haproxy httpd +keepalived kernel-devel memcached mod_ssl @@ -29,3 +32,9 @@ yum-utils -*-firmware -wpa_supplicant -wireless-tools +# needed for SST for percona xtrabackup +socat +# required for IB +libnl +libxml2-python +bc diff --git a/xcat/templates/c7-os/controller.synclist b/xcat/templates/c7-os/controller.synclist index f3504e5..0b67cf5 100644 --- a/xcat/templates/c7-os/controller.synclist +++ b/xcat/templates/c7-os/controller.synclist @@ -1,4 +1,3 @@ - -APPEND: -/install/syncfiles/hosts.allow.append -> /etc/hosts.allow -/install/syncfiles/hosts.deny.append -> /etc/hosts.deny +/etc/salt/pki/master/minions/stack.pem -> /etc/salt/pki/minion/minion.pem +/etc/salt/pki/master/minions/stack.pub -> /etc/salt/pki/minion/minion.pub +/etc/salt/pki/master/master.pub -> /etc/salt/pki/minion/minion_master.pub diff --git a/xcat/templates/c7-os/nova.icehouse.otherpkgs.pkglist b/xcat/templates/c7-os/nova.icehouse.otherpkgs.pkglist new file mode 100644 index 0000000..d398847 --- /dev/null +++ b/xcat/templates/c7-os/nova.icehouse.otherpkgs.pkglist @@ -0,0 +1,25 @@ +## PackStack/Puppet +epel/puppet + +## OpenStack Deps +rdo-openstack/openstack-utils +rdo-openstack/openstack-selinux + +## Nova +rdo-openstack/openstack-nova-compute + +## Neutron +rdo-openstack/openstack-neutron +rdo-openstack/openstack-neutron-openvswitch +rdo-openstack/openstack-neutron-ml2 + +## Telemetry +rdo-openstack/openstack-ceilometer-compute + +## Nagios +epel/nagios-plugins* +epel/nrpe + +## Misc +epel/scsi-target-utils +extras/python-greenlet diff --git a/xcat/templates/c7-os/nova.juno.otherpkgs.pkglist b/xcat/templates/c7-os/nova.juno.otherpkgs.pkglist index c60b5de..bbb3365 100644 --- a/xcat/templates/c7-os/nova.juno.otherpkgs.pkglist +++ b/xcat/templates/c7-os/nova.juno.otherpkgs.pkglist @@ -23,3 +23,5 @@ epel/nrpe ## Misc epel/scsi-target-utils extras/python-greenlet + +epel/salt-minion diff --git a/xcat/templates/c7-os/nova.kilo.otherpkgs.pkglist b/xcat/templates/c7-os/nova.kilo.otherpkgs.pkglist new file mode 100644 index 0000000..c464ea1 --- /dev/null +++ b/xcat/templates/c7-os/nova.kilo.otherpkgs.pkglist @@ -0,0 +1,25 @@ +## PackStack/Puppet +rdo-openstack-kilo/puppet + +## OpenStack Deps +rdo-openstack-kilo/openstack-utils +rdo-openstack-kilo/openstack-selinux + +## Nova +rdo-openstack-kilo/openstack-nova-compute + +## Neutron +rdo-openstack-kilo/openstack-neutron +rdo-openstack-kilo/openstack-neutron-openvswitch +rdo-openstack-kilo/openstack-neutron-ml2 + +## Telemetry +rdo-openstack-kilo/openstack-ceilometer-compute + +## Nagios +rdo-openstack-kilo/nagios-plugins* +rdo-openstack-kilo/nrpe + +## Misc +epel/salt-minion +extras/python-werkzeug diff --git a/xcat/templates/c7-os/nova.pkglist b/xcat/templates/c7-os/nova.pkglist index 83c4fc3..59b17ff 100644 --- a/xcat/templates/c7-os/nova.pkglist +++ b/xcat/templates/c7-os/nova.pkglist @@ -21,6 +21,11 @@ xauth xorg-x11-utils yum-plugin-priorities yum-utils +tcl +libxml2-python +bc +tk -*-firmware -wpa_supplicant -wireless-tools + diff --git a/xcat/templates/c7-os/nova.synclist b/xcat/templates/c7-os/nova.synclist new file mode 100644 index 0000000..0b67cf5 --- /dev/null +++ b/xcat/templates/c7-os/nova.synclist @@ -0,0 +1,3 @@ +/etc/salt/pki/master/minions/stack.pem -> /etc/salt/pki/minion/minion.pem +/etc/salt/pki/master/minions/stack.pub -> /etc/salt/pki/minion/minion.pub +/etc/salt/pki/master/master.pub -> /etc/salt/pki/minion/minion_master.pub