Changes for Demo

Added user1, user2, and user3. user1 and user2 are in tenantA. user3 is in tenantB. Ensure demo scripts have correct ownership and permissions.
designate-dns · Apr 30, 2014 · 721cb99 · 721cb99
1 parent 0c398f4
commit 721cb99
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 35 deletions.
diff --git a/files/openrc.user → files/openrc.user1 b/files/openrc.user → files/openrc.user1
@@ -1,4 +1,4 @@
-export OS_TENANT_NAME=user
-export OS_USERNAME=user
+export OS_TENANT_NAME=tenantA
+export OS_USERNAME=user1
 export OS_PASSWORD=password
 export OS_AUTH_URL=http://127.0.0.1:35357/v2.0
diff --git a/files/openrc.user2 b/files/openrc.user2
@@ -0,0 +1,4 @@
+export OS_TENANT_NAME=tenantA
+export OS_USERNAME=user2
+export OS_PASSWORD=password
+export OS_AUTH_URL=http://127.0.0.1:35357/v2.0
diff --git a/files/openrc.user3 b/files/openrc.user3
@@ -0,0 +1,4 @@
+export OS_TENANT_NAME=tenantB
+export OS_USERNAME=user3
+export OS_PASSWORD=password
+export OS_AUTH_URL=http://127.0.0.1:35357/v2.0
diff --git a/scripts/openstack_base.sh b/scripts/openstack_base.sh
@@ -24,4 +24,6 @@ popd
 #cp /tmp/files/interfaces /etc/network/interfaces
 
 cp /tmp/files/openrc.admin /home/vagrant/openrc.admin
-cp /tmp/files/openrc.user /home/vagrant/openrc.user
+cp /tmp/files/openrc.user1 /home/vagrant/openrc.user1
+cp /tmp/files/openrc.user2 /home/vagrant/openrc.user2
+cp /tmp/files/openrc.user3 /home/vagrant/openrc.user3
diff --git a/scripts/openstack_keystone.sh b/scripts/openstack_keystone.sh
@@ -33,9 +33,15 @@ keystone tenant-create --name=admin --description="Admin Tenant"
 keystone user-role-add --user=admin --tenant=admin --role=admin
 keystone user-role-add --user=admin --tenant=admin --role=_member_
 
-keystone user-create --name=user --pass=password --email=user@designate-workshop.com
-keystone tenant-create --name=user --description="User Tenant"
-keystone user-role-add --user=user --tenant=user --role=_member_
+keystone user-create --name=user1 --pass=password --email=user1@designate-workshop.com
+keystone user-create --name=user2 --pass=password --email=user2@designate-workshop.com
+keystone tenant-create --name=tenantA --description="Tenant A"
+keystone user-role-add --user=user1 --tenant=tenantA --role=_member_
+keystone user-role-add --user=user2 --tenant=tenantA --role=_member_
+
+keystone user-create --name=user3 --pass=password --email=user3@designate-workshop.com
+keystone tenant-create --name=tenantB --description="Tenant B"
+keystone user-role-add --user=user3 --tenant=tenantB --role=_member_
 
 # Services
 keystone service-create --name=keystone --type=identity --description="OpenStack Identity Service"

diff --git a/scripts/openstack_neutron.sh b/scripts/openstack_neutron.sh
@@ -49,13 +49,25 @@ neutron router-gateway-set admin-router ext-net
 ADMIN_NETWORK_ID=`neutron net-list | grep ' admin-network ' | cut -d' ' -f2`
 echo "export OS_NETWORK_ID=$ADMIN_NETWORK_ID" >> /home/vagrant/openrc.admin
 
-# Create default networking config for user tenant
-source /home/vagrant/openrc.user
-neutron net-create user-network
-neutron subnet-create user-network --name user-subnet --gateway 172.31.253.1 172.31.253.0/24
-neutron router-create user-router
-neutron router-interface-add user-router user-subnet
-neutron router-gateway-set user-router ext-net
-
-USER_NETWORK_ID=`neutron net-list | grep ' user-network ' | cut -d' ' -f2`
-echo "export OS_NETWORK_ID=$USER_NETWORK_ID" >> /home/vagrant/openrc.user
+# Create default networking config for tenant A
+source /home/vagrant/openrc.user1
+neutron net-create tenantA-network
+neutron subnet-create tenantA-network --name tenantA-subnet --gateway 172.31.252.1 172.31.252.0/24
+neutron router-create tenantA-router
+neutron router-interface-add tenantA-router tenantA-subnet
+neutron router-gateway-set tenantA-router ext-net
+
+TENANTA_NETWORK_ID=`neutron net-list | grep ' tenantA-network ' | cut -d' ' -f2`
+echo "export OS_NETWORK_ID=$TENANTA_NETWORK_ID" >> /home/vagrant/openrc.user1
+echo "export OS_NETWORK_ID=$TENANTA_NETWORK_ID" >> /home/vagrant/openrc.user2
+
+# Create default networking config for tenant B
+source /home/vagrant/openrc.user3
+neutron net-create tenantB-network
+neutron subnet-create tenantB-network --name tenantB-subnet --gateway 172.31.253.1 172.31.253.0/24
+neutron router-create tenantB-router
+neutron router-interface-add tenantB-router tenantB-subnet
+neutron router-gateway-set tenantB-router ext-net
+
+TENANTB_NETWORK_ID=`neutron net-list | grep ' tenantB-network ' | cut -d' ' -f2`
+echo "export OS_NETWORK_ID=$TENANTB_NETWORK_ID" >> /home/vagrant/openrc.user3
diff --git a/scripts/openstack_nova.sh b/scripts/openstack_nova.sh
@@ -30,6 +30,14 @@ nova flavor-create --is-public True m1.xxxtiny 202 64 1 1
 
 nova keypair-add --pub-key /home/vagrant/.ssh/authorized_keys vagrant
 
-source /home/vagrant/openrc.user
+source /home/vagrant/openrc.user1
+
+nova keypair-add --pub-key /home/vagrant/.ssh/authorized_keys vagrant
+
+source /home/vagrant/openrc.user2
+
+nova keypair-add --pub-key /home/vagrant/.ssh/authorized_keys vagrant
+
+source /home/vagrant/openrc.user3
 
 nova keypair-add --pub-key /home/vagrant/.ssh/authorized_keys vagrant
diff --git a/scripts/workshop.sh b/scripts/workshop.sh
@@ -2,21 +2,6 @@
 
 set -ex
 
-export DEBIAN_FRONTEND=noninteractive
-
-# Install PowerDNS
-mysql -e 'CREATE DATABASE `powerdns` CHARACTER SET utf8 COLLATE utf8_general_ci;'
-
-echo "pdns-backend-mysql	pdns-backend-mysql/dbconfig-install	boolean	false" | debconf-set-selections
-apt-get --yes install pdns-server pdns-backend-mysql
-
-cp /tmp/files/pdns.conf /etc/powerdns/pdns.conf
-cp /tmp/files/pdns.local.gmysql /etc/powerdns/pdns.d/pdns.local.gmysql
-
-chmod 755 /etc/powerdns/pdns.d
-chmod 644 /etc/powerdns/pdns.conf
-chmod 644 /etc/powerdns/pdns.d/*
-
 # Copy over base files for the workshop
 cp /tmp/files/JSON.sh /home/vagrant/JSON.sh
 cp /tmp/files/createserver.sh /home/vagrant/createserver.sh
@@ -25,13 +10,28 @@ cp /tmp/files/getserver.sh /home/vagrant/getserver.sh
 cp /tmp/files/listservers.sh /home/vagrant/listservers.sh
 cp /tmp/files/getusertoken.sh /home/vagrant/getusertoken.sh
 cp /tmp/files/selectenv.sh /home/vagrant/selectenv.sh
+chown vagrant:vagrant /home/vagrant/JSON.sh
+chown vagrant:vagrant /home/vagrant/createserver.sh
+chown vagrant:vagrant /home/vagrant/deleteserver.sh
+chown vagrant:vagrant /home/vagrant/getserver.sh
+chown vagrant:vagrant /home/vagrant/listservers.sh
+chown vagrant:vagrant /home/vagrant/getusertoken.sh
+chown vagrant:vagrant /home/vagrant/selectenv.sh
+chown vagrant:vagrant /home/vagrant/openrc.admin
+chown vagrant:vagrant /home/vagrant/openrc.user1
+chown vagrant:vagrant /home/vagrant/openrc.user2
+chown vagrant:vagrant /home/vagrant/openrc.user3
+chmod 740 /home/vagrant/JSON.sh
+chmod 740 /home/vagrant/createserver.sh
+chmod 740 /home/vagrant/deleteserver.sh
+chmod 740 /home/vagrant/getserver.sh
+chmod 740 /home/vagrant/listservers.sh
+chmod 740 /home/vagrant/getusertoken.sh
+chmod 740 /home/vagrant/selectenv.sh
 
 # Install Required Packages
 apt-get --yes install curl
 
 #Clone the designate repos locally
 sudo -u vagrant git clone https://github.com/stackforge/designate.git /home/vagrant/designate
 sudo -u vagrant git clone https://github.com/stackforge/python-designateclient.git /home/vagrant/python-designateclient
-
-# Make sure everything in vagrant's home is owned by vagrant
-chown -R vagrant /home/vagrant