Multiple updates

dkilcy · Jan 18, 2015 · a4f48b2 · a4f48b2
1 parent ec53aeb
commit a4f48b2
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 66 deletions.
diff --git a/conf/ifcfg-enp0s20f0 b/conf/ifcfg-enp0s20f0
@@ -0,0 +1,6 @@
+DEVICE="enp0s20f0"
+DEVICETYPE="TeamPort"
+ONBOOT="yes"
+BOOTPROTO="none"
+TEAM_MASTER="team0"
+IPV6INIT="no"
diff --git a/conf/ifcfg-enp0s20f1 b/conf/ifcfg-enp0s20f1
@@ -0,0 +1,6 @@
+DEVICE="enp0s20f1"
+DEVICETYPE="TeamPort"
+ONBOOT="yes"
+BOOTPROTO="none"
+TEAM_MASTER="team0"
+IPV6INIT="no"
diff --git a/conf/ifcfg-enp0s20f2 b/conf/ifcfg-enp0s20f2
@@ -0,0 +1,6 @@
+DEVICE="enp0s20f2"
+DEVICETYPE="TeamPort"
+ONBOOT="yes"
+BOOTPROTO="none"
+TEAM_MASTER="team1"
+IPV6INIT="no"
diff --git a/conf/ifcfg-enp0s20f3 b/conf/ifcfg-enp0s20f3
@@ -0,0 +1,6 @@
+DEVICE="enp0s20f3"
+DEVICETYPE="TeamPort"
+ONBOOT="yes"
+BOOTPROTO="none"
+TEAM_MASTER="team1"
+IPV6INIT="no"
diff --git a/conf/ifcfg-team0 b/conf/ifcfg-team0
@@ -0,0 +1,8 @@
+DEVICE="team0"
+DEVICETYPE="Team"
+ONBOOT="yes"
+BOOTPROTO="none"
+IPADDR=10.0.1.21
+NETMASK=255.255.255.0
+TEAM_CONFIG='{"runnner":{"name":"roundrobin"}}'
+MTU=9000
diff --git a/conf/ifcfg-team1 b/conf/ifcfg-team1
@@ -0,0 +1,8 @@
+DEVICE="team1"
+DEVICETYPE="Team"
+ONBOOT="yes"
+BOOTPROTO="none"
+IPADDR=10.0.1.31
+NETMASK=255.255.255.0
+TEAM_CONFIG='{"runnner":{"name":"roundrobin"}}'
+MTU=9000
diff --git a/notes/admin-openrc.sh b/notes/admin-openrc.sh
@@ -0,0 +1,4 @@
+export OS_USERNAME=admin
+export OS_PASSWORD=$ADMIN_PASS
+export OS_TENANT_NAME=admin
+export OS_AUTH_URL=http://controller1:35357/v2.0
diff --git a/notes/auth-openrc.sh b/notes/auth-openrc.sh
@@ -0,0 +1,22 @@
+export ADMIN_PASS=94bcee677185fee9c0bf
+export ADMIN_TOKEN=016389abda0579b560c0
+export CEILOMETER_DBPASS=55a0690b47fec6f98a31
+export CEILOMETER_PASS=d16c43e1a962a554c948
+export CINDER_DBPASS=5680258bb2c2b4dee1ee
+export CINDER_PASS=c9f59d5c328fc3977297
+export DASH_DBPASS=f0baa153daac61a24102
+export DEMO_PASS=6efd10a180784267be4c
+export GLANCE_DBPASS=6d44ef12b707316851f2
+export GLANCE_PASS=d6b6ed7dac1e80c684e8
+export HEAT_DBPASS=a99a98179f6edb0ca113
+export HEAT_PASS=c6adaa597fbce9289f90
+export KEYSTONE_DBPASS=376ebc0ee6649544c178
+export METADATA_SECRET=0cb2bb516881d71eff88
+export NEUTRON_DBPASS=f06432c2e047666d99e3
+export NEUTRON_PASS=b398f7d80d20b77e238c
+export NOVA_DBPASS=efc32b404d4f285c1a5a
+export NOVA_PASS=a1b587dd687cff6a6dff
+export RABBIT_PASS=guest
+export TROVE_DBPASS=8d2f0c22de016fe093f4
+export TROVE_PASS=18c357877c7120e6cca4
+export SWIFT_PASS=0d882fe21dfe142ea3df
diff --git a/notes/demo-openrc.sh b/notes/demo-openrc.sh
@@ -0,0 +1,4 @@
+export OS_USERNAME=demo
+export OS_PASSWORD=$DEMO_PASS
+export OS_TENANT_NAME=demo
+export OS_AUTH_URL=http://controller1:5000/v2.0
diff --git a/pillar/auth.sls b/pillar/auth.sls
@@ -32,6 +32,7 @@ openstack:
   controller: controller1
   network: network1
 
-  service_tenant_id: 2d006b28b19b4c36b3b990fb863506c3
+  service_tenant_id: 78b364cc0fab41ba9091eab5b7b6eebb
+#  service_tenant_id: 2d006b28b19b4c36b3b990fb863506c3
 
 
diff --git a/states/openstack/horizon/init.sls b/states/openstack/horizon/init.sls
@@ -1,32 +1,41 @@
 
-openstack-dashboard:
-  pkg.installed:
-    - name: openstack-dashboard
+{% set controller = salt['pillar.get']('openstack:controller') %}
 
-httpd:
+openstack-dashboard:
   pkg.installed:
-    - name: httpd
+    - pkgs:
+      - openstack-dashboard
+      - httpd
+      - mod_wsgi
+      - memcached
+      - python-memcached
 
-mod_wsgi:
-  pkg.installed:
-    - name: mod_wsgi
+openstack-dashboard-css:
+  cmd.run:
+    - name: chown -R apache:apache /usr/share/openstack-dashboard/static
+    - require:
+      - pkg: openstack-dashboard
 
-memcached:
-  pkg.installed:
-    - name: memcached
+openstack-dashboard-allowed_hosts:
+  file.replace:
+    - name: /etc/openstack-dashboard/local_settings
+    - pattern: ALLOWED_HOSTS = \['horizon.example.com', 'localhost'\]
+    - repl: ALLOWED_HOSTS = ['*']
 
-python-memcached:
-  pkg.installed:
-    - name: python-memcached
+openstack-dashboard-controller:
+  file.replace:
+    - name: /etc/openstack-dashboard/local_settings
+    - pattern: OPENSTACK_HOST = "127.0.0.1"
+    - repl: OPENSTACK_HOST = "{{ controller }}"
 
-openstack-dashboard:
-  cmd.run:
-    - name: chown -R apache:apache /usr/share/openstack-dashboard/static
+httpd:
+  service.running:
+    - name: httpd
+    - enable: True
 
-#  service.running:
-#    - name: httpd
-#    - enable: True
-#
 #  service.running:
 #    - name: memcached
 #    - enable: True
+#    - require:
+#      - service: httpd
+
diff --git a/states/openstack/neutron/network.sls b/states/openstack/neutron/network.sls
@@ -241,6 +241,7 @@ neutron_metadata_agent_8:
 #openvswitch_add_external_bridge_to_external_nic:
 #  cmd.run:
 #    - name: ovs-vsctl add-port br-ex enp0s20f1
+#    - name: ovs-vsctl add-port br-ex enp0s20f2
 #
 ## 
 neutron_network_openvswitch_agent:

diff --git a/states/openstack/nova/compute.sls b/states/openstack/nova/compute.sls
@@ -84,13 +84,13 @@ nova_conf_verbose:
     - value: 'True'
 
 
-#nova_libvirtd_service:
-#  service.running:
-#    - name: libvirtd
-#    - enable: True
-#
-#nova_compute_service:
-#  service.running:
-#    - name: openstack-nova-compute
-#    - enable: True
+nova_libvirtd_service:
+  service.running:
+    - name: libvirtd
+    - enable: True
+
+nova_compute_service:
+  service.running:
+    - name: openstack-nova-compute
+    - enable: True
 
diff --git a/states/openstack/nova/controller.sls b/states/openstack/nova/controller.sls
@@ -209,33 +209,33 @@ nova_db_sync:
     - group: nova
 
 
-#nova_api_service:
-  #service.running:
-    #- name: openstack-nova-api
-    #- enable: True
-#
-#nova_cert_service:
-  #service.running:
-    #- name: openstack-nova-cert
-    #- enable: True
+nova_api_service:
+  service.running:
+    - name: openstack-nova-api
+    - enable: True
+
+nova_cert_service:
+  service.running:
+    - name: openstack-nova-cert
+    - enable: True
 #
-#nova_consoleauth_service:
-  #service.running:
-    #- name: openstack-nova-consoleauth
-    #- enable: True
+nova_consoleauth_service:
+  service.running:
+    - name: openstack-nova-consoleauth
+    - enable: True
 #
-#nova_scheduler_service:
-  #service.running:
-    #- name: openstack-nova-scheduler
-    #- enable: True
+nova_scheduler_service:
+  service.running:
+    - name: openstack-nova-scheduler
+    - enable: True
 #
-#nova_conductor_service:
-  #service.running:
-    #- name: openstack-nova-conductor
-    #- enable: True
+nova_conductor_service:
+  service.running:
+    - name: openstack-nova-conductor
+    - enable: True
 #
-#nova_novncproxy_service:
-  #service.running:
-    #- name: openstack-nova-novncproxy
-    #- enable: True
+nova_novncproxy_service:
+  service.running:
+    - name: openstack-nova-novncproxy
+    - enable: True
 ###
diff --git a/states/top.sls b/states/top.sls
@@ -5,29 +5,30 @@ openstack:
     - yumrepo
 
   'G@environment:openstack and G@role:controller':
-    - openstack.utils
-    - openstack.auth
+#    - openstack.utils
+#    - openstack.auth
 #    - mariadb
 #    - rabbitmq
 #    - openstack.keystone
+#    - openstack.keystone.env
 #    - openstack.glance
 #    - openstack.nova.controller
 #    - openstack.neutron.controller
-#    - openstack.horizon
+    - openstack.horizon
 #    - openstack.cinder.controller
 #    - openstack.swift.controller
 #    - mongodb
 #    - openstack.ceilometer.controller
 #    - openstack.ceilometer.glance
 
-  'G@environment:openstack and G@role:network':
-    - openstack.utils
-    - openstack.auth
-#    - openstack.neutron.network
+#  'G@environment:openstack and G@role:network':
+#    - openstack.utils
+#    - openstack.auth
+#   - openstack.neutron.network
 
-  'G@environment:openstack and G@role:compute':
-    - openstack.utils
-    - openstack.auth
+#  'G@environment:openstack and G@role:compute':
+#    - openstack.utils
+#    - openstack.auth
 #    - openstack.nova.compute
 #    - openstack.neutron.compute
 #    - openstack.ceilometer.compute