Midonet element now complies with version 5.2
This commit introduces all the necessary changes to be able to build an overcloud-full image with the midonet modules on it. Change-Id: I220a230868ac1f21cc2d773dff08bd9e995914fe
This commit is contained in:
Alejandro Andreu
parent
793a8d995c
commit
8ee01a569c
|
|
@ -6,14 +6,45 @@ Install all packages required for an OpenStack deployment with MidoNet.
|
|||
MidoNet MEM (MidoNet with customer support) can also be installed. To do so,
|
||||
build the image with the following environment variables:
|
||||
|
||||
* DIB_MIDONET_release=MEM
|
||||
* DIB_MIDONET_openstack_version=latest|mitaka|liberty|...
|
||||
* DIB_MIDONET_mem_username=yourcustomerrepousername
|
||||
* DIB_MIDONET_mem_password=yourcustomerrepopassword
|
||||
## Variables
|
||||
|
||||
### DIB\_MIDONET\_release
|
||||
|
||||
Whether to install the open source or the enterprise version. Available values
|
||||
are `OSS` and `MEM`. Default is `OSS`.
|
||||
|
||||
If `MEM` is the selected option, you must specify these variables too:
|
||||
|
||||
* `DIB_MIDONET_mem_username`
|
||||
* `DIB_MIDONET_mem_password`
|
||||
|
||||
### DIB\_MIDONET\_stage
|
||||
|
||||
Install `stable`, `testing` or `unstable` packages. Default is `stable`.
|
||||
|
||||
### DIB\_MIDONET\_version
|
||||
|
||||
What version of Midonet to install. Default is `5.2`.
|
||||
|
||||
### DIB\_MIDONET\_openstack\_version
|
||||
|
||||
Specify the version of OpenStack you're using. Default is `mitaka`.
|
||||
|
||||
### DIB\_MIDONET\_mem\_username
|
||||
|
||||
Username to be used against the MEM repository. Must be provided when setting
|
||||
`DIB_MIDONET_release` to `MEM`.
|
||||
|
||||
### DIB\_MIDONET\_mem\_password
|
||||
|
||||
Password to be used against the MEM repository. Must be provided when setting
|
||||
`DIB_MIDONET_release` to `MEM`.
|
||||
|
||||
## Considerations
|
||||
|
||||
MidoNet components come from packages, so use the already exposed:
|
||||
|
||||
* export DIB_INSTALLTYPE_overcloud_network_midonet=package
|
||||
* `export DIB_INSTALLTYPE_overcloud_network_midonet=package`
|
||||
|
||||
Puppet modules will be downloaded from pinned sources (see `environment.d` and
|
||||
`source-repository-overcloud-network-midonet` files)
|
||||
Puppet modules will be downloaded from pinned sources (see files in
|
||||
`environment.d` and `source-repository-overcloud-network-midonet` folders).
|
||||
|
|
|
|||
|
|
@ -1,14 +1,39 @@
|
|||
export DIB_MIDONET_release=${DIB_MIDONET_release:-"OSS"} # Available values OSS/MEM. To build MidoNet image with support or without it. Open Source version by default
|
||||
export DIB_MIDONET_openstack_version=${DIB_MIDONET_openstack_version:-"latest"} # OpenStack version of the midonet neutron plugin
|
||||
export DIB_MIDONET_mem_username=${DIB_MIDONET_mem_username:-} # Username of the yum repo. Only needed when DIB_MIDONET_version = "MEM"
|
||||
export DIB_MIDONET_mem_password=${DIB_MIDONET_mem_password:-} # Password of the yum repo. Only needed when DIB_MIDONET_version = "MEM"
|
||||
# Build midonet image with OSS or enterprise repository
|
||||
# Possible values: OSS, MEM
|
||||
export DIB_MIDONET_release=${DIB_MIDONET_release:-"OSS"}
|
||||
|
||||
# Whether the stable version should be installed or not
|
||||
# Possible values: stable, testing, unstable
|
||||
export DIB_MIDONET_stage=${DIB_MIDONET_stage:-"stable"}
|
||||
|
||||
# Midonet version that we want to install
|
||||
export DIB_MIDONET_version=${DIB_MIDONET_version:-"5.2"}
|
||||
|
||||
# OpenStack version of the midonet neutron plugin
|
||||
export DIB_MIDONET_openstack_version=${DIB_MIDONET_openstack_version:-"mitaka"}
|
||||
|
||||
# Username of the yum repo (only applicable when DIB_MIDONET_release is MEM)
|
||||
export DIB_MIDONET_mem_username=${DIB_MIDONET_mem_username:-}
|
||||
|
||||
# Password of the yum repo (only applicable when DIB_MIDONET_release is MEM)
|
||||
export DIB_MIDONET_mem_password=${DIB_MIDONET_mem_password:-}
|
||||
|
||||
# Only download source for Puppet modules
|
||||
#export DIB_INSTALLTYPE_puppet_modules="source"
|
||||
|
||||
export DIB_INSTALLTYPE_puppet_midonet="source"
|
||||
export DIB_INSTALLTYPE_puppetlabs_inifile="source"
|
||||
export DIB_INSTALLTYPE_puppetlabs_apt="source"
|
||||
export DIB_INSTALLTYPE_puppetlabs_java="source"
|
||||
export DIB_INSTALLTYPE_puppetlabs_stdlib="source"
|
||||
export DIB_INSTALLTYPE_puppetlabs_apache="source"
|
||||
export DIB_INSTALLTYPE_puppetlabs_concat="source"
|
||||
export DIB_INSTALLTYPE_zookeeper="source"
|
||||
export DIB_INSTALLTYPE_cassandra="source"
|
||||
export DIB_INSTALLTYPE_puppet_curator="source"
|
||||
export DIB_INSTALLTYPE_puppet_elasticsearch="source"
|
||||
export DIB_INSTALLTYPE_puppet_logstash="source"
|
||||
export DIB_INSTALLTYPE_puppet_lib_file_concat="source"
|
||||
export DIB_INSTALLTYPE_puppet_datacat="source"
|
||||
export DIB_INSTALLTYPE_puppet_midonet_openstack="source"
|
||||
|
||||
# Only source is available now for puppet modules.
|
||||
export DIB_INSTALLTYPE_ripienar_module_data='source'
|
||||
export DIB_INSTALLTYPE_puppetlabs_java='source'
|
||||
export DIB_INSTALLTYPE_puppetlabs_apt='source'
|
||||
export DIB_INSTALLTYPE_richardc_datacat='source'
|
||||
export DIB_INSTALLTYPE_deric_zookeeper='source'
|
||||
export DIB_INSTALLTYPE_nanliu_staging='source'
|
||||
export DIB_INSTALLTYPE_puppetlabs_tomcat='source'
|
||||
export DIB_INSTALLTYPE_puppet_midonet='source'
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ else
|
|||
fi
|
||||
|
||||
MIDONET_REPOS_DIR=$TMP_MOUNT_PATH/etc/yum.repos.d
|
||||
MIDONET_TARGET_FILE_NAME=MidoNet.repo
|
||||
MIDONET_TARGET_FILE_NAME=midonet.repo
|
||||
|
||||
mkdir -p $MIDONET_REPOS_DIR
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
[midonet]
|
||||
name=MidoNet
|
||||
baseurl=http://${DIB_MIDONET_mem_username}:${DIB_MIDONET_mem_password}@yum.midokura.com/repo/v1.9/stable/RHEL/7/
|
||||
baseurl=http://${DIB_MIDONET_mem_username}:${DIB_MIDONET_mem_password}@builds.midonet.org/mem-${DIB_MEM_version}/${DIB_MIDONET_stage}/el$releasever
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=http://${DIB_MIDONET_mem_username}:${DIB_MIDONET_mem_password}@yum.midokura.com/repo/RPM-GPG-KEY-midokura
|
||||
gpgkey=https://builds.midonet.org/midorepo.key
|
||||
|
||||
[datastax]
|
||||
name = DataStax Repo for Apache Cassandra
|
||||
baseurl = http://rpm.datastax.com/community
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
gpgkey = https://rpm.datastax.com/rpm/repo_key
|
||||
name=DataStax Repo for Apache Cassandra
|
||||
baseurl=http://rpm.datastax.com/community
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=https://rpm.datastax.com/rpm/repo_key
|
||||
|
||||
[midonet-openstack-integration]
|
||||
name=MidoNet OpenStack Integration
|
||||
baseurl=http://builds.midonet.org/openstack-${DIB_MIDONET_openstack_version}/stable/el7/
|
||||
baseurl=http://builds.midonet.org/openstack-${DIB_MIDONET_openstack_version}/${DIB_MIDONET_stage}/el$releasever
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=http://builds.midonet.org/midorepo.key
|
||||
gpgkey=https://builds.midonet.org/midorepo.key
|
||||
|
||||
[midonet-misc]
|
||||
name=MidoNet 3rd Party Tools and Libraries
|
||||
baseurl=http://repo.midonet.org/misc/RHEL/7/misc/
|
||||
baseurl=http://builds.midonet.org/misc/${DIB_MIDONET_stage}/el$releasever
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=http://repo.midonet.org/RPM-GPG-KEY-midokura
|
||||
gpgkey=https://builds.midonet.org/midorepo.key
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
[midonet]
|
||||
name=MidoNet
|
||||
baseurl=http://repo.midonet.org/midonet/v2015.06/RHEL/7/stable/
|
||||
baseurl=http://builds.midonet.org/midonet-${DIB_MIDONET_version}/${DIB_MIDONET_stage}/el7
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=http://repo.midonet.org/RPM-GPG-KEY-midokura
|
||||
gpgkey=https://builds.midonet.org/midorepo.key
|
||||
|
||||
[datastax]
|
||||
name = DataStax Repo for Apache Cassandra
|
||||
baseurl = http://rpm.datastax.com/community
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
gpgkey = https://rpm.datastax.com/rpm/repo_key
|
||||
name=DataStax Repo for Apache Cassandra
|
||||
baseurl=http://rpm.datastax.com/community
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=https://rpm.datastax.com/rpm/repo_key
|
||||
|
||||
[midonet-openstack-integration]
|
||||
name=MidoNet OpenStack Integration
|
||||
baseurl=http://builds.midonet.org/openstack-${DIB_MIDONET_openstack_version}/stable/el7/
|
||||
baseurl=http://builds.midonet.org/openstack-${DIB_MIDONET_openstack_version}/${DIB_MIDONET_stage}/el7
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=http://builds.midonet.org/midorepo.key
|
||||
gpgkey=https://builds.midonet.org/midorepo.key
|
||||
|
||||
[midonet-misc]
|
||||
name=MidoNet 3rd Party Tools and Libraries
|
||||
baseurl=http://repo.midonet.org/misc/RHEL/7/misc/
|
||||
baseurl=http://builds.midonet.org/misc/${DIB_MIDONET_stage}/el7
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=http://repo.midonet.org/RPM-GPG-KEY-midokura
|
||||
gpgkey=https://builds.midonet.org/midorepo.key
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
midonet_package
|
||||
midonet_neutron_package
|
||||
midonet_api_package
|
||||
zookeeper_package
|
||||
cassandra_package
|
||||
deltarpm_package
|
||||
augeas_package
|
||||
augeasdevel_package
|
||||
tomcat_package
|
||||
rubydevel_package
|
||||
rubygem_json_package
|
||||
sensu_package
|
||||
oschecks_package
|
||||
biosdevname
|
||||
cassandra_package
|
||||
deltarpm_package
|
||||
fluentd_package
|
||||
midonet_cli_package
|
||||
midonet_cluster_package
|
||||
midonet_package
|
||||
rubydevel_package
|
||||
rubygem_fluent_package
|
||||
rubygem_json_package
|
||||
oschecks_package
|
||||
sensu_package
|
||||
zookeeper_package
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
"default": {
|
||||
"augeas_package": "augeas",
|
||||
"augeasdevel_package": "augeas-devel",
|
||||
"biosdevname": "biosdevname",
|
||||
"cassandra_package": "dsc20",
|
||||
"deltarpm_package": "deltarpm",
|
||||
"fluentd_package": "fluentd",
|
||||
"midonet_api_package": "midonet-api",
|
||||
"midonet_neutron_package": "python-networking-midonet",
|
||||
"midonet_cli_package": "python-midonetclient",
|
||||
"midonet_cluster_package": "midonet-cluster",
|
||||
"midonet_package": "midolman",
|
||||
"rubydevel_package": "ruby-devel",
|
||||
"rubygem_fluent_package": "rubygem-fluent-plugin-add",
|
||||
"rubygem_json_package": "rubygem-json",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"sensu_package": "sensu",
|
||||
"tomcat_package": "tomcat",
|
||||
"zookeeper_package": "zookeeper"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,15 @@
|
|||
ripienar-module_data git /opt/stack/puppet-midonet/module_data https://github.com/ripienaar/puppet-module-data.git 0.0.3
|
||||
puppetlabs-java git /opt/stack/puppet-midonet/java https://github.com/puppetlabs/puppetlabs-java
|
||||
puppet-midonet git /opt/stack/puppet-midonet/midonet https://github.com/openstack/puppet-midonet.git eefd8c2f3db5c7172b0dab76a9952547cbfc7fb6
|
||||
puppetlabs-inifile git /opt/stack/puppet-midonet/inifile https://github.com/puppetlabs/puppetlabs-inifile.git 88bf9868b532ddf556bdb617f67eda9de0b8dc0f
|
||||
puppetlabs-apt git /opt/stack/puppet-midonet/apt https://github.com/puppetlabs/puppetlabs-apt.git 47c6f338eda98ed849531d92b63c5e33103f76e4
|
||||
richardc-datacat git /opt/stack/puppet-midonet/datacat https://github.com/richardc/puppet-datacat.git
|
||||
deric-zookeeper git /opt/stack/puppet-midonet/zookeeper https://github.com/deric/puppet-zookeeper.git 05aae38bcc22095365c08cff192a19fe66cce3f2
|
||||
nanliu-staging git /opt/stack/puppet-midonet/staging https://github.com/nanliu/puppet-staging.git bc434a71e19aae54223d57c274e2e1a7f9546d5e
|
||||
puppetlabs-tomcat git /opt/stack/puppet-midonet/tomcat https://github.com/puppetlabs/puppetlabs-tomcat.git 019772988b39cb259bf281ab9655e8a83c7bc2d8
|
||||
puppet-midonet git /opt/stack/puppet-midonet/midonet https://github.com/midonet/puppet-midonet.git e24515c135a03096fc69651dfadac5b545c74538
|
||||
puppetlabs-java git /opt/stack/puppet-midonet/java https://github.com/puppetlabs/puppetlabs-java 72a801c1e9f1c583a9a8f1f73dc9ff54860d47ea
|
||||
puppetlabs-stdlib git /opt/stack/puppet-midonet/stdlib https://github.com/puppetlabs/puppetlabs-stdlib.git 2a75ed08a1b967d5d64144c449a1c1aed50e8d78
|
||||
puppetlabs-apache git /opt/stack/puppet-midonet/apache https://github.com/puppetlabs/puppetlabs-apache 410309f5facd0df7d836ea66c27ca9514031b6e3
|
||||
zookeeper git /opt/stack/puppet-midonet/zookeeper https://github.com/deric/puppet-zookeeper.git b53bf81abcddefa2200fb23ca7039bea4332cb3a
|
||||
cassandra git /opt/stack/puppet-midonet/cassandra https://github.com/locp/cassandra.git 698dc80d501fc7b2cedf3d88d1c9fdb6630a2d8f
|
||||
puppetlabs-concat git /opt/stack/puppet-midonet/concat https://github.com/puppetlabs/puppetlabs-concat.git a999bf26a118a3045fd5d4785f304232f5cea0ed
|
||||
puppet-curator git /opt/stack/puppet-midonet/curator https://github.com/tubemogul/puppet-curator.git d06718876f6d850f7b6c70c5f201c6576c86a74e
|
||||
puppet-elasticsearch git /opt/stack/puppet-midonet/elasticsearch https://github.com/elastic/puppet-elasticsearch.git b752b42f1e0f52a1db1318b6a1edda3929d5a72e
|
||||
puppet-logstash git /opt/stack/puppet-midonet/logstash https://github.com/elastic/puppet-logstash.git f56acd98c7bd126525d02a9ade8bc59d73e5f894
|
||||
puppet-lib-file_concat git /opt/stack/puppet-midonet/file_concat https://github.com/electrical/puppet-lib-file_concat.git 813132b5d776204e1da169a93e4bc6a1e253f75c
|
||||
puppet-datacat git /opt/stack/puppet-midonet/datacat https://github.com/richardc/puppet-datacat.git 9d2cd07b8777a559a0d5e475b0b5651d412f5ba0
|
||||
puppet-midonet_openstack git /opt/stack/puppet-midonet/midonet_openstack https://github.com/midonet/puppet-midonet_openstack.git 2f5b155c1cc14591d5022fb355b81789c538f110
|
||||
|
|
|
|||
Loading…
Reference in New Issue