diff --git a/deployment_scripts/post_pg_license.sh b/deployment_scripts/post_pg_license.sh index 5cb76a4..3bd4732 100644 --- a/deployment_scripts/post_pg_license.sh +++ b/deployment_scripts/post_pg_license.sh @@ -25,6 +25,9 @@ set -x if [[ ! -f "/root/post_director" ]];then + #Restart plumgrid service before posting license + service plumgrid restart + #Wait for the platform to come up sleep 5 retry_cnt=0 diff --git a/deployment_scripts/puppet/manifests/director.pp b/deployment_scripts/puppet/manifests/director.pp index c0a49ff..c28d3dc 100644 --- a/deployment_scripts/puppet/manifests/director.pp +++ b/deployment_scripts/puppet/manifests/director.pp @@ -154,9 +154,12 @@ class { '::neutron::plugins::plumgrid': controller_priv_host => $service_endpoint, connection => $neutron_db_uri, nova_metadata_ip => '169.254.169.254', + nova_metadata_subnet => '169.254.169.252/30', nova_metadata_port => '8775', metadata_proxy_shared_secret => $metadata_secret, package_ensure => 'latest', + identity_version => 'v3', + user_domain_name => 'Default' } exec { "neutron-db-manage upgrade heads": diff --git a/deployment_scripts/puppet/manifests/director_fixes.pp b/deployment_scripts/puppet/manifests/director_fixes.pp index eebcf1b..114b90c 100644 --- a/deployment_scripts/puppet/manifests/director_fixes.pp +++ b/deployment_scripts/puppet/manifests/director_fixes.pp @@ -32,3 +32,27 @@ file_line { 'ensure no port conflict between apache-keystone': ensure => 'absent', require => File['/etc/apache2/ports.conf'] } + +ini_setting { 'Add Project domain name variable to plumlib.ini': + ensure => 'present', + path => '/etc/neutron/plugins/plumgrid/plumlib.ini', + section => 'keystone_authtoken', + setting => 'user_domain_name', + value => 'Default', +} + +ini_setting { 'Add enable_reverse_flow paramater in plumlib.ini': + ensure => 'present', + path => '/etc/neutron/plugins/plumgrid/plumlib.ini', + section => 'PLUMgridLibrary', + setting => 'enable_reverse_flow_tap', + value => 'True', +} + +ini_setting { 'Add nova_metaconfig paramater in plumlib.ini': + ensure => 'present', + path => '/etc/neutron/plugins/plumgrid/plumlib.ini', + section => 'PLUMgridLibrary', + setting => 'nova_metaconfig', + value => 'True', +} diff --git a/deployment_scripts/puppet/manifests/disable_openvswitch.pp b/deployment_scripts/puppet/manifests/disable_openvswitch.pp index 430cef2..08d8477 100644 --- a/deployment_scripts/puppet/manifests/disable_openvswitch.pp +++ b/deployment_scripts/puppet/manifests/disable_openvswitch.pp @@ -15,10 +15,9 @@ notice('MODULAR: plumgrid/disable_ovs.pp') -file_line { 'Disable ovs in globals.yaml': - path => '/etc/hiera/globals.yaml', - line => ' use_ovs: false', - match => 'use_ovs', +file { '/etc/hiera/plugins/plumgrid.yaml': + ensure => file, + content => 'use_ovs: false', } file_line { 'Replace provider ovs with lnx': @@ -27,10 +26,3 @@ file_line { 'Replace provider ovs with lnx': match => ' provider: ovs', multiple => true, } - -file_line { 'Replace provider ovs with lnx in globals.yaml': - path => '/etc/hiera/globals.yaml', - line => ' provider: lnx', - match => ' provider: ovs', - multiple => true, -} diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 5e96d61..db61a76 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -15,8 +15,6 @@ type: skipped - id: openstack-network-routers-ha type: skipped -- id: openstack-network-compute-nova - type: skipped # Skip Neutron agents - id: primary-openstack-network-agents-l3 type: skipped @@ -50,18 +48,8 @@ puppet_modules: puppet/modules:/etc/puppet/modules timeout: 120 -- id: openstack-network-plumgrid-compute-nova - groups: ['compute'] - required_for: [openstack-network-end] - requires: [openstack-network-common-config] - type: puppet - parameters: - puppet_manifest: puppet/manifests/plumgrid_nova_compute.pp - puppet_modules: puppet/modules/:/etc/puppet/modules/ - timeout: 1440 - - id: pgtools-support - role: ['controller', 'primary-controller'] + groups: ['controller', 'primary-controller'] required_for: [post_deployment_end] requires: [post_deployment_start] type: puppet @@ -71,7 +59,7 @@ timeout: 3000 - id: check-pgzone - role: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller'] + groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller'] required_for: [post_deployment_end, pg_common] requires: [post_deployment_start] type: puppet @@ -81,7 +69,7 @@ timeout: 720 - id: pg_common - role: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller'] + groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller'] required_for: [post_deployment_end, setup-director] requires: [post_deployment_start, check-pgzone, configure_default_route] type: puppet @@ -91,7 +79,7 @@ timeout: 3000 - id: setup-director - role: ['controller', 'primary-controller'] + groups: ['controller', 'primary-controller'] required_for: [post_deployment_end, director-fixes] requires: [post_deployment_start, pg_common] type: puppet @@ -101,7 +89,7 @@ timeout: 3000 - id: director-fixes - role: ['controller', 'primary-controller'] + groups: ['controller', 'primary-controller'] required_for: [post_deployment_end, post_pg_license] requires: [post_deployment_start, setup-director] type: puppet @@ -129,9 +117,9 @@ timeout: 3000 - id: setup-edge - role: ['compute'] - required_for: [post_deployment_end, setup-gateway] - requires: [post_deployment_start, solution-api] + groups: ['compute'] + required_for: [post_deployment_end] + requires: [post_deployment_start, solution-api, pg_common] type: puppet parameters: puppet_manifest: puppet/manifests/edge.pp @@ -139,9 +127,9 @@ timeout: 3000 - id: setup-gateway - role: ['PLUMgrid-Gateway'] + groups: ['PLUMgrid-Gateway'] required_for: [post_deployment_end] - requires: [post_deployment_start, setup-edge] + requires: [post_deployment_start, solution-api, pg_common] type: puppet parameters: puppet_manifest: puppet/manifests/gateway.pp diff --git a/metadata.yaml b/metadata.yaml index 8024c5c..35c8226 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -3,11 +3,11 @@ name: plumgrid # Human-readable name for your plugin title: PLUMgrid plugin # Plugin version -version: '2.0.0' +version: '3.0.0' # Description description: This plugin enables the usage of PLUMgrid ONS as the network backend. # Required fuel version -fuel_version: ['8.0'] +fuel_version: ['9.0'] # Specify license of your plugin licenses: ['Apache License Version 2.0'] authors: ['javeriak@plumgrid.com', 'abdullah.khan@plumgrid.com'] @@ -17,7 +17,7 @@ groups: ['network'] # The plugin is compatible with releases in the list releases: - os: ubuntu - version: liberty-8.0 + version: mitaka-9.0 mode: ['ha', 'multinode'] deployment_scripts_path: deployment_scripts/ repository_path: repositories/ubuntu