switched to using production environment instead of os-networks and os-database roles

2012-09-17 11:57:18 -05:00
parent b44fb3b418
commit 1b84009615
17 changed files with 16 additions and 90 deletions
--- a/TODO.org
+++ b/TODO.org
@@ -40,6 +40,7 @@
 ** glance
   make a glance::client for other cookbooks
   refactor the glance/image upload in glance::api to use more idempotent Chef resources, perhaps as a separate recipe for readability
+   run as the glance user instead of sudo
 ** os-database
   document this
 ** os-networks
@@ -61,6 +62,8 @@
 ** nova::compute
   abstract out hypervisors and key off of attribute
   nova::network needs to move out
+** nova::volume
+   everything fails without this
 ** nova::vncproxy
   needs to break out xen vs. kvm support
 ** swift
@@ -87,6 +90,7 @@
   openstack-monitoring
   openstack-syslog
 * Documentation
+** Convert to ReStructuredText
 ** Diagrams for Role/Cookbook relationships
   knife-spaghetti-roles
   Keystone
@@ -104,7 +108,7 @@
 * Technical Roadmap
 ** LXC
 ** Swift
-** Folsom Milestone 3
+** Folsom RC1
 ** HA setups
 ** Baremetal
 ** Hyper-V
@@ -117,50 +121,6 @@
 ** IPv6
   DreamHost is doing this somewhat.
   Grizzly?
-* Weekly Status 8/24
-** Goals for this week:
-*** prerequisites for networking documented
-*** nova-compute vms failing during networking
-*** nova-volume stop complaining
-*** integrate Chef for OpenStack Hackday efforts
-*** push openstack cookbooks to community site and Opscode github repos
-*** start on the Quick Start for Chef and OpenStack
-*** started work on Spiceweasel to make it Librarian-aware
-** LA Chef for OpenStack Hackday
-*** Prerequisites documentation (OS, network)
-   I'm still having issues with the configuration of networking with my VMs but this appears to be related to configuration of my nova-compute hosts and will get documented in the prerequisites.
-   controller -> should run nova-network
-   compute -> should only run nova-network with FlatDHCP
-*** strategies for osops-utils to short-circuit searches for load balancers/fixed IPs
-    move to environments, update osops-utils
-*** Ceph as Cinder
-    Carl will start moving cookbooks to Folsom M3
-*** determine what's up with services starting, restarting and enabling
-    wait for HA in Folsom?
-    John Dewey will investigate
-*** knife-hp
-*** Technical Debt!
-    osops-utils needs to find networking from environments to override search results. take the node.chef_environment,
-*** documentation discussion, investigating MultiMarkDown for unifying docs into single PDF or HTML
-*** potential contributors
-    AT&T
-    DreamHost
-** Cookbooks
-*** database - need to test and update to 1.3.4
-*** mysql - need to test and update to 1.3.0
-*** osops-utils - mostly synced, a few minor patches ahead for debugging
-*** sysctl - new dep, need to get upstreamed and documented
-*** rabbitmq - fix for COOK-1496, waiting on RCB for a new rabbitmq::distro recipe
-*** apt - need to test 1.4.8
-*** need to resync keystone, glance, nova and horizon with latest Rackspace patches
+* Weekly Status 9/14


-    added pm-utils
-    bridge-utils!!!???
-
-    mysql
-    mysql -pvbyH4FV_6HTkiMntgHSC
-    select id, host, hostname, display_name, access_ip_v4, task_state from instances;
-
-
-    Device "eth0.100" does not exist
--- a/environments/production.rb
+++ b/environments/production.rb
@@ -1,7 +1,11 @@
-name "os-networks"
-description "Define the networks you're going to use with OpenStack. These will be used in the libraries provided by the osops-utils cookbook. This example is "
+name "production"
+description "Defines the network and database settings you're going to use with OpenStack. The networks will be used in the libraries provided by the osops-utils cookbook. This example is for FlatDHCP with 2 physical networks."

 override_attributes(
+  "mysql" => {
+    "allow_remote_root" => true,
+    "root_network_acl" => "%"
+  },
  "osops_networks" => {
    "public" => "10.0.111.0/24",
    "management" => "10.0.200.0/24",
@@ -22,15 +26,6 @@ override_attributes(
        "dns1" => "8.8.8.8",
        "dns2" => "8.8.4.4"
      }
-      # {
-      #   "label" => "private",
-      #   "ipv4_cidr" => "192.168.200.0/24",
-      #   "num_networks" => "1",
-      #   "network_size" => "255",
-      #   "bridge" => "br200",
-      #   "bridge_dev" => "eth1"
-      # }
-
    ]
  }
  )
--- a/infrastructure.yml
+++ b/infrastructure.yml
@@ -35,17 +35,18 @@ cookbooks:
  - 5.0.0
 - nova: #used by nova roles
  - 5.0.0
+- apache2: #required by horizon
+  - 1.1.12
 - horizon: #used by horizon-server role
  - 5.0.0

 environments:
+- production:

 data bags:

 roles:
  - base:
-  - os-database:
-  - os-networks:
  - mysql-master:
  - rabbitmq-server:
  - keystone:
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -1,6 +1,7 @@
 name "base"
 description "Base role for a server"
 run_list(
+  "recipe[apt]",
  "recipe[openssh]",
  "recipe[ntp]"
 )
--- a/roles/glance-api.rb
+++ b/roles/glance-api.rb
@@ -2,7 +2,6 @@ name "glance-api"
 description "Glance API server"
 run_list(
  "role[base]",
-  "role[os-networks]",
  "recipe[glance::api]"
 )

--- a/roles/glance-registry.rb
+++ b/roles/glance-registry.rb
@@ -2,8 +2,6 @@ name "glance-registry"
 description "Glance Registry server"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[glance::registry]"
 )

--- a/roles/horizon-server.rb
+++ b/roles/horizon-server.rb
@@ -2,8 +2,6 @@ name "horizon-server"
 description "Horizon server"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[mysql::client]",
  "recipe[horizon::server]"
 )
--- a/roles/keystone.rb
+++ b/roles/keystone.rb
@@ -2,8 +2,6 @@ name "keystone"
 description "Keystone server"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[keystone::server]"
 )

--- a/roles/nova-api-ec2.rb
+++ b/roles/nova-api-ec2.rb
@@ -2,7 +2,5 @@ name "nova-api-ec2"
 description "Nova API EC2"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[nova::api-ec2]"
 )
--- a/roles/nova-api-os-compute.rb
+++ b/roles/nova-api-os-compute.rb
@@ -2,7 +2,5 @@ name "nova-api-os-compute"
 description "Nova API for Compute"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[nova::api-os-compute]"
 )
--- a/roles/nova-scheduler.rb
+++ b/roles/nova-scheduler.rb
@@ -2,7 +2,5 @@ name "nova-scheduler"
 description "Nova scheduler"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[nova::scheduler]"
 )
--- a/roles/nova-setup.rb
+++ b/roles/nova-setup.rb
@@ -2,7 +2,5 @@ name "nova-setup"
 description "Where the setup operations for nova get run"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[nova::nova-setup]"
 )
--- a/roles/nova-vncproxy.rb
+++ b/roles/nova-vncproxy.rb
@@ -2,8 +2,6 @@ name "nova-vncproxy"
 description "Nova VNC Proxy"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[nova::vncproxy]"
 )

--- a/roles/nova-volume.rb
+++ b/roles/nova-volume.rb
@@ -2,7 +2,5 @@ name "nova-volume"
 description "Nova Volume Service"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[nova::volume]"
 )
--- a/roles/os-database.rb
+++ b/roles/os-database.rb
@@ -1,9 +0,0 @@
-name "os-database"
-description "Define the database settings you're going to use with OpenStack."
-
-override_attributes(
-  "mysql" => {
-    "allow_remote_root" => true,
-    "root_network_acl" => "%"
-  }
-  )
--- a/roles/rabbitmq-server.rb
+++ b/roles/rabbitmq-server.rb
@@ -2,7 +2,6 @@ name "rabbitmq-server"
 description "RabbitMQ Server (non-ha)"
 run_list(
  "role[base]",
-  "recipe[apt]",
  "recipe[erlang::default]",
  "recipe[rabbitmq::default]"
 )
--- a/roles/single-compute.rb
+++ b/roles/single-compute.rb
@@ -2,8 +2,6 @@ name "single-compute"
 description "Nova compute (with non-HA Controller)"
 run_list(
  "role[base]",
-  "role[os-database]",
-  "role[os-networks]",
  "recipe[nova::compute]"
 )