Merge lp:~springfield-team/charms/trusty/nova-cloud-controller/next into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Shiv Prasad Rao]

This merge proposal is prepared to enable N1KV plugin to install with charm logic for nova-cloud-controller.
Similar to ovs and nvp, n1kv (Nexus 1000V) is another layer 2 virtual switch provided by Cisco Nexus 1000V engineering team, which is a host side VM switching fabric building block we call it VEM (Virtual Ethernet Switch). 1+ VEM work in tandem with a VSM (Virtual Switch Module) to form a virtual chassis in a data center.
Please also refer to the VEM/VSM charm and Cisco Nexus1000V related document for its detail.

config.yaml
- added n1kv as a possible value for quantum-plugin
- added n1kv-vsm-username, n1kv-vsm-password, n1kv-vsm-ip to communicate with its supervisor module with (VSM)

hooks/charmhelpers/contrib/openstack/context.py
- Added n1kv related dictionary for context look-up

hooks/charmhelpers/contrib/openstack/neutron.py
- Added n1kv related plugin logic data formation

hooks/nova_cc_hooks.py
- Added copy logic to copy Cisco n1kv template to /root

templates/havana/cisco_plugins.ini
- New file for Cisco Plugin related parameters

templates/havana/neutron.conf
- Added customized system parameters for N1KV plugin to run with

templates/havana/cisco_plugin.ini
- Adding support for PostgreSQL for cisco_plugin.ini

Please refer to old merge proposal if needed:
https://code.launchpad.net/~springfield-team/charms/precise/nova-cloud-controller/trunk/+merge/218172

[Shiv Prasad Rao (shivrao)]

I have submitted changes required for charm-helpers as part of another commit to lp:charm-helpers
https://code.launchpad.net/~springfield-team/charm-helpers/trunk/+merge/234402

[Hua Zhang (zhhuabj)]

some inline comments, thanks.

review: Needs Fixing

[lp:~springfield-team/charms/trusty/nova-cloud-controller/next]

102. By Shiv Prasad Rao on 2014-09-17

Addressing review comments

103. By Shiv Prasad Rao on 2014-09-17

Upstream 102

[Shiv Prasad Rao (shivrao)]

Accepted the review comments.
Synced with latest revision

[lp:~springfield-team/charms/trusty/nova-cloud-controller/next]

104. By Shiv Prasad Rao on 2014-09-18

Fixing a typo

105. By Shiv Prasad Rao on 2014-10-09

Addressed Review comments:
1.Removed openrc generation
2.Trimmed down comments from cisco_plugins.ini

106. By Shiv Prasad Rao on 2014-10-09

Sync with revision 112

107. By Shiv Prasad Rao on 2014-10-09

typo

108. By Shiv Prasad Rao on 2014-11-05

Addressing review comments

1. Added delimiter for cisco options in config.yaml
2. Removed cisco_plugins.ini for havana. Added conditional block in icehouse template

Unmerged revisions

108. By Shiv Prasad Rao on 2014-11-05

Addressing review comments

1. Added delimiter for cisco options in config.yaml
2. Removed cisco_plugins.ini for havana. Added conditional block in icehouse template

107. By Shiv Prasad Rao on 2014-10-09

typo

106. By Shiv Prasad Rao on 2014-10-09

Sync with revision 112

105. By Shiv Prasad Rao on 2014-10-09

Addressed Review comments:
1.Removed openrc generation
2.Trimmed down comments from cisco_plugins.ini

104. By Shiv Prasad Rao on 2014-09-18

Fixing a typo

103. By Shiv Prasad Rao on 2014-09-17

Upstream 102

102. By Shiv Prasad Rao on 2014-09-17

Addressing review comments

101. By Shiv Prasad Rao on 2014-09-15

Adding support for Cisco N1kV

=== modified file 'config.yaml'
--- config.yaml	2014-09-16 08:59:35 +0000
+++ config.yaml	2014-09-17 19:34:44 +0000
@@ -243,3 +243,25 @@
       .
       Increasing this value will increase instance density on compute nodes
       at the potential expense of instance performance.
+  n1kv-vsm-username:
+    type: string
+    default: admin
+    description: Username to connect to Cisco Nexus1000v VSM
+  n1kv-vsm-password:
+    type: string
+    default: abc123
+    description: Password to connect to Cisco Nexus1000v VSM
+  n1kv-vsm-ip:
+    type: string
+    default: 10.10.10.10
+    description: IP address to connect to Cisco Nexus1000v VSM
+  n1kv-restrict-policy-profiles:
+    type: boolean
+    default: false
+      All tenants will be able to access all policy profiles if disblaed. 
+      If enabled, tenants can access only those policy profiles which are 
+      explicitly assigned to them by admin.
+  n1kv-config-flags:
+    default: None
+    type: string
+    description: Comma separated list of key=value config flags to be set in cisco_plugins.ini

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-08-13 13:12:02 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-09-17 19:34:44 +0000
@@ -597,6 +597,7 @@
                                           self.network_manager)
         n1kv_config = neutron_plugin_attribute(self.plugin, 'config',
                                                self.network_manager)
+        n1kv_user_config_flags = config('n1kv-config-flags')
         n1kv_ctxt = {
             'core_plugin': driver,
             'neutron_plugin': 'n1kv',
@@ -607,9 +608,12 @@
             'vsm_username': config('n1kv-vsm-username'),
             'vsm_password': config('n1kv-vsm-password'),
             'restrict_policy_profiles': config(
-                'n1kv_restrict_policy_profiles'),
+                'n1kv-restrict-policy-profiles'),
         }
-
+        if n1kv_user_config_flags:
+            flags = config_flags_parser(n1kv_user_config_flags)
+            n1kv_ctxt['n1kv_user_config_flags'] = flags
+        
         return n1kv_ctxt
 
     def neutron_ctxt(self):

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-09-12 13:57:42 +0000
+++ hooks/nova_cc_hooks.py	2014-09-17 19:34:44 +0000
@@ -111,6 +111,9 @@
 @hooks.hook()
 def install():
     execd_preinstall()
+    plugin = config('quantum-plugin')
+    if (plugin == 'n1kv'):
+        shutil.copy2('templates/havana/openrc', '/root/')
     configure_installation_source(config('openstack-origin'))
     apt_update()
     apt_install(determine_packages(), fatal=True)

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-09-12 13:57:42 +0000
+++ hooks/nova_cc_utils.py	2014-09-17 19:34:44 +0000
@@ -93,6 +93,7 @@
 HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
 APACHE_CONF = '/etc/apache2/sites-available/openstack_https_frontend'
 APACHE_24_CONF = '/etc/apache2/sites-available/openstack_https_frontend.conf'
+OPENRC = '/root/openrc'
 NEUTRON_DEFAULT = '/etc/default/neutron-server'
 QUANTUM_DEFAULT = '/etc/default/quantum-server'
 
@@ -174,6 +175,10 @@
         'contexts': [nova_cc_context.ApacheSSLContext()],
         'services': ['apache2'],
     }),
+    (OPENRC, {
+        'contexts': [context.IdentityServiceContext()],
+        'services': [],
+    }),
 ])
 
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'

=== added file 'templates/havana/cisco_plugins.ini'
--- templates/havana/cisco_plugins.ini	1970-01-01 00:00:00 +0000
+++ templates/havana/cisco_plugins.ini	2014-09-17 19:34:44 +0000
@@ -0,0 +1,157 @@
+[cisco_plugins]
+ 
+# (StrOpt) Period-separated module path to the plugin class to use for
+# the Cisco Nexus switches.
+#
+# nexus_plugin = neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin
+ 
+# (StrOpt) Period-separated module path to the plugin class to use for
+# the virtual switches on compute nodes.
+#
+# vswitch_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
+ 
+ 
+[cisco]
+ 
+# (StrOpt) A short prefix to prepend to the VLAN number when creating a
+# VLAN interface. For example, if an interface is being created for
+# VLAN 2001 it will be named 'q-2001' using the default prefix.
+#
+# vlan_name_prefix = q-
+# Example: vlan_name_prefix = vnet-
+ 
+# (StrOpt) A short prefix to prepend to the VLAN number when creating a
+# provider VLAN interface. For example, if an interface is being created
+# for provider VLAN 3003 it will be named 'p-3003' using the default prefix.
+#
+# provider_vlan_name_prefix = p-
+# Example: provider_vlan_name_prefix = PV-
+ 
+# (BoolOpt) A flag indicating whether Openstack networking should manage the
+# creation and removal of VLAN interfaces for provider networks on the Nexus
+# switches. If the flag is set to False then Openstack will not create or
+# remove VLAN interfaces for provider networks, and the administrator needs
+# to manage these interfaces manually or by external orchestration.
+#
+# provider_vlan_auto_create = True
+ 
+# (BoolOpt) A flag indicating whether Openstack networking should manage
+# the adding and removing of provider VLANs from trunk ports on the Nexus
+# switches. If the flag is set to False then Openstack will not add or
+# remove provider VLANs from trunk ports, and the administrator needs to
+# manage these operations manually or by external orchestration.
+#
+# provider_vlan_auto_trunk = True
+ 
+# (StrOpt) Period-separated module path to the model class to use for
+# the Cisco neutron plugin.
+#
+# model_class = neutron.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2
+ 
+# (StrOpt) Period-separated module path to the driver class to use for
+# the Cisco Nexus switches.
+#
+# If no value is configured, a fake driver will be used.
+# nexus_driver = neutron.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver
+# With real hardware, use the CiscoNEXUSDriver class:
+# nexus_driver = neutron.plugins.cisco.nexus.cisco_nexus_network_driver_v2.CiscoNEXUSDriver
+ 
+# (BoolOpt) A flag to enable round robin scheduling of routers for SVI.
+# svi_round_robin = False
+ 
+ 
+# Cisco Nexus Switch configurations.
+# Each switch to be managed by Openstack Neutron must be configured here.
+#
+# Cisco Nexus Switch Format.
+# [NEXUS_SWITCH:<IP address of switch>]
+# <hostname>=<port>                 (1)
+# ssh_port=<ssh port>               (2)
+# username=<credential username>    (3)
+# password=<credential password>    (4)
+#
+# (1) For each host connected to a port on the switch, specify the hostname
+#     and the Nexus physical port (interface) it is connected to.
+# (2) The TCP port for connecting via SSH to manage the switch. This is
+#     port number 22 unless the switch has been configured otherwise.
+# (3) The username for logging into the switch to manage it.
+# (4) The password for logging into the switch to manage it.
+#
+# Example:
+# [NEXUS_SWITCH:1.1.1.1]
+# compute1=1/1
+# compute2=1/2
+# ssh_port=22
+# username=admin
+# password=mySecretPassword
+ 
+#
+# N1KV Format.
+# [N1KV:<IP address of VSM>]
+# username=<credential username>
+# password=<credential password>
+#
+# Example:
+# [N1KV:2.2.2.2]
+# username=admin
+# password=mySecretPassword
+ 
+[cisco_n1k]
+ 
+# (StrOpt) Specify the name of the integration bridge to which the VIFs are
+# attached.
+#
+integration_bridge = br-int
+ 
+# (StrOpt) Name of the policy profile to be associated with a port when no
+# policy profile is specified during port creates.
+#
+default_policy_profile = default-pp
+# Example: default_policy_profile = service_profile
+ 
+# (StrOpt) Name of the policy profile to be associated with a port owned by
+# network node (dhcp, router).
+#
+network_node_policy_profile = default-pp
+# Example: network_node_policy_profile = dhcp_pp
+ 
+# (StrOpt) Name of the network profile to be associated with a network when no
+# network profile is specified during network creates. Admin should pre-create
+# a network profile with this name.
+#
+# default_network_profile =
+# Example: default_network_profile = network_pool
+ 
+# (StrOpt) Time in seconds for which the plugin polls the VSM for updates in
+# policy profiles.
+#
+#poll_duration = 10
+# Example: poll_duration = 180
+
+restrict_policy_profiles = {{ restrict_policy_profiles }}
+# Example: restrict_policy_profiles = False 
+
+{% if n1kv_user_config_flags -%}
+{% for key, value in n1kv_user_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% include "parts/section-database" %}
+ 
+[CISCO_PLUGINS]
+vswitch_plugin = neutron.plugins.cisco.n1kv.n1kv_neutron_plugin.N1kvNeutronPluginV2
+ 
+[N1KV:{{ vsm_ip }}]
+password = {{ vsm_password }}
+username = {{ vsm_username }}
+
+[securitygroup]
+{% if neutron_security_groups -%}
+#Firewall driver for realizing neutron security group function.
+#firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+enable_security_group = True
+{% else -%}
+firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+{% endif -%}

=== modified file 'templates/havana/neutron.conf'
--- templates/havana/neutron.conf	2014-04-16 08:25:14 +0000
+++ templates/havana/neutron.conf	2014-09-17 19:34:44 +0000
@@ -27,6 +27,12 @@
 
 {% include "parts/rabbitmq" %}
 
+{% if neutron_plugin and neutron_plugin == 'n1kv' -%}
+rpc_backend = neutron.openstack.common.rpc.impl_kombu
+api_extensions_path = /usr/share/pyshared/neutron/plugins/cisco/extensions
+network_auto_schedule = False
+{% endif %}
+
 [quotas]
 quota_driver = neutron.db.quota_db.DbQuotaDriver
 {% if neutron_security_groups -%}

=== added file 'templates/havana/openrc'
--- templates/havana/openrc	1970-01-01 00:00:00 +0000
+++ templates/havana/openrc	2014-09-17 19:34:44 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+#This is an example of openrc
+# READ:http://docs.openstack.org/user-guide/content/cli_openrc.html
+export OS_NO_CACHE=true
+export OS_TENANT_NAME=admin
+export OS_USERNAME=
+export OS_PASSWORD=
+export OS_AUTH_URL=http://{{ service_host }}:{{ service_port }}/v2.0/  
+export OS_AUTH_STRATEGY=keystone
+export OS_REGION_NAME=RegionOne
+export CINDER_ENDPOINT_TYPE=publicURL
+export GLANCE_ENDPOINT_TYPE=publicURL
+export KEYSTONE_ENDPOINT_TYPE=publicURL
+export NOVA_ENDPOINT_TYPE=publicURL
+export QUANTUM_ENDPOINT_TYPE=publicURL

=== added file 'templates/icehouse/cisco_plugins.ini'
--- templates/icehouse/cisco_plugins.ini	1970-01-01 00:00:00 +0000
+++ templates/icehouse/cisco_plugins.ini	2014-09-17 19:34:44 +0000
@@ -0,0 +1,179 @@
+[cisco_plugins]
+ 
+# (StrOpt) Period-separated module path to the plugin class to use for
+# the Cisco Nexus switches.
+#
+# nexus_plugin = neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin
+ 
+# (StrOpt) Period-separated module path to the plugin class to use for
+# the virtual switches on compute nodes.
+#
+# vswitch_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
+ 
+ 
+[cisco]
+ 
+# (StrOpt) A short prefix to prepend to the VLAN number when creating a
+# VLAN interface. For example, if an interface is being created for
+# VLAN 2001 it will be named 'q-2001' using the default prefix.
+#
+# vlan_name_prefix = q-
+# Example: vlan_name_prefix = vnet-
+ 
+# (StrOpt) A short prefix to prepend to the VLAN number when creating a
+# provider VLAN interface. For example, if an interface is being created
+# for provider VLAN 3003 it will be named 'p-3003' using the default prefix.
+#
+# provider_vlan_name_prefix = p-
+# Example: provider_vlan_name_prefix = PV-
+ 
+# (BoolOpt) A flag indicating whether Openstack networking should manage the
+# creation and removal of VLAN interfaces for provider networks on the Nexus
+# switches. If the flag is set to False then Openstack will not create or
+# remove VLAN interfaces for provider networks, and the administrator needs
+# to manage these interfaces manually or by external orchestration.
+#
+# provider_vlan_auto_create = True
+ 
+# (BoolOpt) A flag indicating whether Openstack networking should manage
+# the adding and removing of provider VLANs from trunk ports on the Nexus
+# switches. If the flag is set to False then Openstack will not add or
+# remove provider VLANs from trunk ports, and the administrator needs to
+# manage these operations manually or by external orchestration.
+#
+# provider_vlan_auto_trunk = True
+ 
+# (StrOpt) Period-separated module path to the model class to use for
+# the Cisco neutron plugin.
+#
+# model_class = neutron.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2
+ 
+# (StrOpt) Period-separated module path to the driver class to use for
+# the Cisco Nexus switches.
+#
+# If no value is configured, a fake driver will be used.
+# nexus_driver = neutron.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver
+# With real hardware, use the CiscoNEXUSDriver class:
+# nexus_driver = neutron.plugins.cisco.nexus.cisco_nexus_network_driver_v2.CiscoNEXUSDriver
+ 
+# (BoolOpt) A flag to enable round robin scheduling of routers for SVI.
+# svi_round_robin = False
+ 
+ 
+# Cisco Nexus Switch configurations.
+# Each switch to be managed by Openstack Neutron must be configured here.
+#
+# Cisco Nexus Switch Format.
+# [NEXUS_SWITCH:<IP address of switch>]
+# <hostname>=<port>                 (1)
+# ssh_port=<ssh port>               (2)
+# username=<credential username>    (3)
+# password=<credential password>    (4)
+#
+# (1) For each host connected to a port on the switch, specify the hostname
+#     and the Nexus physical port (interface) it is connected to.
+# (2) The TCP port for connecting via SSH to manage the switch. This is
+#     port number 22 unless the switch has been configured otherwise.
+# (3) The username for logging into the switch to manage it.
+# (4) The password for logging into the switch to manage it.
+#
+# Example:
+# [NEXUS_SWITCH:1.1.1.1]
+# compute1=1/1
+# compute2=1/2
+# ssh_port=22
+# username=admin
+# password=mySecretPassword
+ 
+#
+# N1KV Format.
+# [N1KV:<IP address of VSM>]
+# username=<credential username>
+# password=<credential password>
+#
+# Example:
+# [N1KV:2.2.2.2]
+# username=admin
+# password=mySecretPassword
+ 
+[cisco_n1k]
+ 
+# (StrOpt) Specify the name of the integration bridge to which the VIFs are
+# attached.
+#
+integration_bridge = br-int
+ 
+# (StrOpt) Name of the policy profile to be associated with a port when no
+# policy profile is specified during port creates.
+#
+default_policy_profile = default-pp
+# Example: default_policy_profile = service_profile
+ 
+# (StrOpt) Name of the policy profile to be associated with a port owned by
+# network node (dhcp, router).
+#
+network_node_policy_profile = default-pp
+# Example: network_node_policy_profile = dhcp_pp
+ 
+# (StrOpt) Name of the network profile to be associated with a network when no
+# network profile is specified during network creates. Admin should pre-create
+# a network profile with this name.
+#
+# default_network_profile =
+# Example: default_network_profile = network_pool
+ 
+# (StrOpt) Time in seconds for which the plugin polls the VSM for updates in
+# policy profiles.
+#
+#poll_duration = 10
+# Example: poll_duration = 180
+
+# (BoolOpt) Specify whether tenants are restricted from accessing all the
+# policy profiles.
+# Default value: False, indicating all tenants can access all policy profiles.
+#
+# restrict_policy_profiles =
+# Example: restrict_policy_profiles = False
+
+# (IntOpt) Number of threads to use to make HTTP requests to the VSM.
+#
+# http_pool_size = 4
+
+# (IntOpt) Time in seconds for which the plugin waits for the VSM to respond.
+#
+# http_timeout = 30
+http_timeout = 120
+
+
+# (BoolOpt) Specify whether plugin should attempt to synchronize with the VSM
+# when neutron is started.
+# Default value: False, indicating no full sync will be performed.
+#
+# enable_sync_on_start = False
+
+restrict_policy_profiles = {{ restrict_policy_profiles }}
+
+{% if n1kv_user_config_flags -%}
+{% for key, value in n1kv_user_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% include "parts/section-database" %}
+ 
+[CISCO_PLUGINS]
+vswitch_plugin = neutron.plugins.cisco.n1kv.n1kv_neutron_plugin.N1kvNeutronPluginV2
+ 
+[N1KV:{{ vsm_ip }}]
+password = {{ vsm_password }}
+username = {{ vsm_username }}
+
+[securitygroup]
+{% if neutron_security_groups -%}
+#Firewall driver for realizing neutron security group function.
+#firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+enable_security_group = True
+{% else -%}
+firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+{% endif -%}

=== modified file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf	2014-08-08 09:31:32 +0000
+++ templates/icehouse/neutron.conf	2014-09-17 19:34:44 +0000
@@ -31,6 +31,11 @@
 
 {% include "parts/rabbitmq" %}
 
+{% if neutron_plugin and neutron_plugin == 'n1kv' -%}
+rpc_backend = neutron.openstack.common.rpc.impl_kombu
+network_auto_schedule = False
+{% endif %}
+
 notify_nova_on_port_status_changes = True
 notify_nova_on_port_data_changes = True
 nova_url = {{ nova_url }}

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2014-09-16 08:59:35 +0000
+++ templates/icehouse/nova.conf	2014-09-17 19:34:44 +0000
@@ -69,6 +69,15 @@
 {% endif -%}
 {% endif -%}
 
+{% if neutron_plugin and neutron_plugin == 'n1kv' -%}
+libvirt_user_virtio_for_bridges =  True
+security_group_api = {{ network_manager }}
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
+{% endif -%}
+
 {% if network_manager_config -%}
 {% for key, value in network_manager_config.iteritems() -%}
 {{ key }} = {{ value }}