openstack/tripleo-puppet-elements
Code Issues Proposed changes

Support for the OpenvSwitch OVN Controller

Browse Source 
This patch
 - adds OVN packages in the overcloud-controller and
   overcloud-compute elements and
 - adds puppet-ovn to puppet-modules.

Change-Id: I1aa1849ffbe74012a8e46e6a2987d3da5f4623ff
This commit is contained in:
Numan Siddique
2016-05-24 20:57:44 +05:30
parent 2d89e0a648
commit 38b51ab80e
6 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
elements/overcloud-compute/install.d/package-installs-overcloud-compute
View File

@@ -9,6 +9,7 @@ neutron_sriov_agent_package
nfs_package nfs_package
nova_compute_package nova_compute_package
ntp_package ntp_package
openvswitch_ovn_compute_package
pacemaker_remote_package pacemaker_remote_package
rubygem_fluent_package rubygem_fluent_package
sensu_package sensu_package

1
elements/overcloud-compute/pkg-map
View File

@@ -12,6 +12,7 @@
"nfs_package": "nfs-utils", "nfs_package": "nfs-utils",
"nova_compute_package": "openstack-nova-compute", "nova_compute_package": "openstack-nova-compute",
"ntp_package": "ntp", "ntp_package": "ntp",
"openvswitch_ovn_compute_package": "openvswitch-ovn-host",
"pacemaker_remote_package": "pacemaker-remote", "pacemaker_remote_package": "pacemaker-remote",
"rubygem_fluent_package": "rubygem-fluent-plugin-add", "rubygem_fluent_package": "rubygem-fluent-plugin-add",
"sensu_package": "sensu" "sensu_package": "sensu"

2
elements/overcloud-controller/install.d/package-installs-overcloud-controller
View File

@@ -43,6 +43,7 @@ neutron_ml2_package
neutron_openvswitch_package neutron_openvswitch_package
neutron_package neutron_package
networking_odl_package networking_odl_package
networking_ovn_package
nfs_package nfs_package
nova_api_package nova_api_package
nova_cert_package nova_cert_package
@@ -51,6 +52,7 @@ nova_console_package
nova_novncproxy_package nova_novncproxy_package
nova_scheduler_package nova_scheduler_package
ntp_package ntp_package
openvswitch_ovn_controller_package
pacemaker_package pacemaker_package
pcs_package pcs_package
python_cradox_package python_cradox_package

2
elements/overcloud-controller/pkg-map
View File

@@ -51,6 +51,7 @@
"neutron_openvswitch_package": "openstack-neutron-openvswitch", "neutron_openvswitch_package": "openstack-neutron-openvswitch",
"neutron_package": "openstack-neutron", "neutron_package": "openstack-neutron",
"networking_odl_package": "python-networking-odl", "networking_odl_package": "python-networking-odl",
"networking_ovn_package": "python-networking-ovn",
"nfs_package": "nfs-utils", "nfs_package": "nfs-utils",
"nova_api_package": "openstack-nova-api", "nova_api_package": "openstack-nova-api",
"nova_cert_package": "openstack-nova-cert", "nova_cert_package": "openstack-nova-cert",
@@ -59,6 +60,7 @@
"nova_novncproxy_package": "openstack-nova-novncproxy", "nova_novncproxy_package": "openstack-nova-novncproxy",
"nova_scheduler_package": "openstack-nova-scheduler", "nova_scheduler_package": "openstack-nova-scheduler",
"ntp_package": "ntp", "ntp_package": "ntp",
"openvswitch_ovn_controller_package": "openvswitch-ovn-central",
"python_cradox_package": "python-cradox", "python_cradox_package": "python-cradox",
"python_openstackclient_package": "python-openstackclient", "python_openstackclient_package": "python-openstackclient",
"python_memcached_package": "python-memcached", "python_memcached_package": "python-memcached",

1
elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh
View File

@@ -39,6 +39,7 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then
puppet-nova \ puppet-nova \
puppet-oslo \ puppet-oslo \
puppet-nssdb \ puppet-nssdb \
puppet-ovn \
puppet-puppet \ puppet-puppet \
puppetlabs-rabbitmq \ puppetlabs-rabbitmq \
puppet-redis \ puppet-redis \

1
elements/puppet-modules/source-repository-puppet-modules
View File

@@ -31,6 +31,7 @@ puppet-neutron git /opt/stack/puppet-modules/neutron https://git.openstack.org/o
puppet-nova git /opt/stack/puppet-modules/nova https://git.openstack.org/openstack/puppet-nova.git puppet-nova git /opt/stack/puppet-modules/nova https://git.openstack.org/openstack/puppet-nova.git
puppet-oslo git /opt/stack/puppet-modules/oslo https://git.openstack.org/openstack/puppet-oslo.git puppet-oslo git /opt/stack/puppet-modules/oslo https://git.openstack.org/openstack/puppet-oslo.git
puppet-nssdb git /opt/stack/puppet-modules/nssdb https://github.com/rcritten/puppet-nssdb.git puppet-nssdb git /opt/stack/puppet-modules/nssdb https://github.com/rcritten/puppet-nssdb.git
puppet-ovn git /opt/stack/puppet-modules/ovn https://git.openstack.org/openstack/puppet-ovn.git
puppet-puppet git /opt/stack/puppet-modules/puppet https://github.com/purpleidea/puppet-puppet.git puppet-puppet git /opt/stack/puppet-modules/puppet https://github.com/purpleidea/puppet-puppet.git
puppetlabs-rabbitmq git /opt/stack/puppet-modules/rabbitmq https://github.com/puppetlabs/puppetlabs-rabbitmq.git puppetlabs-rabbitmq git /opt/stack/puppet-modules/rabbitmq https://github.com/puppetlabs/puppetlabs-rabbitmq.git
puppet-redis git /opt/stack/puppet-modules/redis https://github.com/arioch/puppet-redis.git puppet-redis git /opt/stack/puppet-modules/redis https://github.com/arioch/puppet-redis.git